Merge branch 'master' of github.com:aeosynth/4chan-x

This commit is contained in:
James Campos 2011-06-23 13:48:43 -07:00
commit 56aa2147ef
2 changed files with 2 additions and 2 deletions

View File

@ -754,7 +754,7 @@
return $.rm($('#qr')); return $.rm($('#qr'));
case keybinds.spoiler: case keybinds.spoiler:
ta = d.activeElement; ta = d.activeElement;
if (d.activeElement.nodeName !== 'TEXTAREA') { if (ta.nodeName !== 'TEXTAREA') {
return; return;
} }
e.preventDefault(); e.preventDefault();

View File

@ -541,7 +541,7 @@ keybinds =
$.rm $ '#qr' $.rm $ '#qr'
when keybinds.spoiler when keybinds.spoiler
ta = d.activeElement ta = d.activeElement
return unless d.activeElement.nodeName is 'TEXTAREA' return unless ta.nodeName is 'TEXTAREA'
e.preventDefault() e.preventDefault()