Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

break up if condition

Browse Source
This commit is contained in:
James Campos 2012-06-03 18:46:28 -07:00
parent bb9510fdaa
commit ca93066d0a
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
4chan_x.user.js
View File

@ -1054,10 +1054,16 @@
return $.on(d, 'keydown', Keybinds.keydown); return $.on(d, 'keydown', Keybinds.keydown);
}, },
keydown: function(e) { keydown: function(e) {
var key, link, o, ta, thread; var key, link, o, target, thread;
if (!(key = Keybinds.keyCode(e)) || /TEXTAREA|INPUT/.test(e.target.nodeName) && !(e.altKey || e.ctrlKey || e.keyCode === 27)) { if (!(key = Kebinds.keyCode(e))) {
return; return;
} }
target = e.target;
if (/TEXTAREA|INPUT/.test(target.nodeName)) {
if (!(e.altKey || e.ctrlKey || e.keyCode === 27)) {
return;
}
}
thread = Nav.getThread(); thread = Nav.getThread();
switch (key) { switch (key) {
case Conf.openQR: case Conf.openQR:
@ -1084,15 +1090,13 @@
} }
break; break;
case Conf.spoiler: case Conf.spoiler:
ta = e.target; if (target.nodeName !== 'TEXTAREA') {
if (ta.nodeName !== 'TEXTAREA') {
return; return;
} }
Keybinds.tags('spoiler', ta); Keybinds.tags('spoiler', ta);
break; break;
case Conf.code: case Conf.code:
ta = e.target; if (target.nodeName !== 'TEXTAREA') {
if (ta.nodeName !== 'TEXTAREA') {
return; return;
} }
Keybinds.tags('code', ta); Keybinds.tags('code', ta);

12
script.coffee
View File

@ -793,8 +793,10 @@ Keybinds =
$.on d, 'keydown', Keybinds.keydown $.on d, 'keydown', Keybinds.keydown
keydown: (e) -> 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 unless key = Kebinds.keyCode e
return {target} = e
if /TEXTAREA|INPUT/.test target.nodeName
return unless e.altKey or e.ctrlKey or e.keyCode is 27
thread = Nav.getThread() thread = Nav.getThread()
switch key switch key
@ -813,12 +815,10 @@ Keybinds =
when Conf.submit when Conf.submit
QR.submit() if QR.el and !QR.status() QR.submit() if QR.el and !QR.status()
when Conf.spoiler when Conf.spoiler
ta = e.target return if target.nodeName isnt 'TEXTAREA'
return if ta.nodeName isnt 'TEXTAREA'
Keybinds.tags 'spoiler', ta Keybinds.tags 'spoiler', ta
when Conf.code when Conf.code
ta = e.target return if target.nodeName isnt 'TEXTAREA'
return if ta.nodeName isnt 'TEXTAREA'
Keybinds.tags 'code', ta Keybinds.tags 'code', ta
# Thread related # Thread related
when Conf.watch when Conf.watch