From ca93066d0a0dd2595be3edb7343e420e40094138 Mon Sep 17 00:00:00 2001 From: James Campos Date: Sun, 3 Jun 2012 18:46:28 -0700 Subject: [PATCH] break up if condition --- 4chan_x.user.js | 16 ++++++++++------ script.coffee | 12 ++++++------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 4cce42059..cf494f2c2 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -1054,10 +1054,16 @@ return $.on(d, 'keydown', Keybinds.keydown); }, keydown: function(e) { - var key, link, o, ta, thread; - if (!(key = Keybinds.keyCode(e)) || /TEXTAREA|INPUT/.test(e.target.nodeName) && !(e.altKey || e.ctrlKey || e.keyCode === 27)) { + var key, link, o, target, thread; + if (!(key = Kebinds.keyCode(e))) { return; } + target = e.target; + if (/TEXTAREA|INPUT/.test(target.nodeName)) { + if (!(e.altKey || e.ctrlKey || e.keyCode === 27)) { + return; + } + } thread = Nav.getThread(); switch (key) { case Conf.openQR: @@ -1084,15 +1090,13 @@ } break; case Conf.spoiler: - ta = e.target; - if (ta.nodeName !== 'TEXTAREA') { + if (target.nodeName !== 'TEXTAREA') { return; } Keybinds.tags('spoiler', ta); break; case Conf.code: - ta = e.target; - if (ta.nodeName !== 'TEXTAREA') { + if (target.nodeName !== 'TEXTAREA') { return; } Keybinds.tags('code', ta); diff --git a/script.coffee b/script.coffee index 8f38ca3f3..44c1765c7 100644 --- a/script.coffee +++ b/script.coffee @@ -793,8 +793,10 @@ Keybinds = $.on d, 'keydown', Keybinds.keydown keydown: (e) -> - if not (key = Keybinds.keyCode(e)) or /TEXTAREA|INPUT/.test(e.target.nodeName) and not (e.altKey or e.ctrlKey or e.keyCode is 27) - return + return unless key = Kebinds.keyCode e + {target} = e + if /TEXTAREA|INPUT/.test target.nodeName + return unless e.altKey or e.ctrlKey or e.keyCode is 27 thread = Nav.getThread() switch key @@ -813,12 +815,10 @@ Keybinds = when Conf.submit QR.submit() if QR.el and !QR.status() when Conf.spoiler - ta = e.target - return if ta.nodeName isnt 'TEXTAREA' + return if target.nodeName isnt 'TEXTAREA' Keybinds.tags 'spoiler', ta when Conf.code - ta = e.target - return if ta.nodeName isnt 'TEXTAREA' + return if target.nodeName isnt 'TEXTAREA' Keybinds.tags 'code', ta # Thread related when Conf.watch