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

Add the has-focus class to the QR element when it has focus.

Browse Source 
@saxamaphone69
This commit is contained in:
Nicolas Stepien 2013-04-13 23:26:15 +02:00
parent c9402fdf65
commit f4bf9b5413
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -1,3 +1,4 @@
- The QR won't auto-hide when auto-hide is enabled and one of its input is focused. Doesn't work on Firefox.
- Fix QR remembering the file spoiler state when it shouldn't. - Fix QR remembering the file spoiler state when it shouldn't.
- Fix QR cooldown in Opera. - Fix QR cooldown in Opera.

2
css/style.css
View File

@ -549,7 +549,7 @@ a[href="javascript:;"] {
:root.hide-original-post-form #postForm, :root.hide-original-post-form #postForm,
:root.hide-original-post-form .postingMode, :root.hide-original-post-form .postingMode,
:root.hide-original-post-form #togglePostForm, :root.hide-original-post-form #togglePostForm,
#qr.autohide:not(:hover) > form { #qr.autohide:not(.has-focus):not(:hover) > form {
display: none; display: none;
} }
#qr select, #dump-button, .remove, .captcha-img { #qr select, #dump-button, .remove, .captcha-img {

24
src/qr.coffee
View File

@ -73,6 +73,10 @@ QR =
QR.status() QR.status()
if !Conf['Remember Spoiler'] and QR.nodes.spoiler.checked if !Conf['Remember Spoiler'] and QR.nodes.spoiler.checked
QR.nodes.spoiler.click() QR.nodes.spoiler.click()
focusin: ->
$.addClass QR.nodes.el, 'has-focus'
focusout: ->
$.rmClass QR.nodes.el, 'has-focus'
hide: -> hide: ->
d.activeElement.blur() d.activeElement.blur()
$.addClass QR.nodes.el, 'autohide' $.addClass QR.nodes.el, 'autohide'
@ -361,6 +365,12 @@ QR =
spoiler: $ 'input', el spoiler: $ 'input', el
span: el.lastChild span: el.lastChild
<% if (type === 'userscript') { %>
# XXX Firefox lacks focusin/focusout support.
for elm in $$ '*', el
$.on elm, 'blur', QR.focusout
$.on elm, 'focus', QR.focusin
<% } %>
$.on el, 'click', @select.bind @ $.on el, 'click', @select.bind @
$.on @nodes.rm, 'click', (e) => e.stopPropagation(); @rm() $.on @nodes.rm, 'click', (e) => e.stopPropagation(); @rm()
$.on @nodes.label, 'click', (e) => e.stopPropagation() $.on @nodes.label, 'click', (e) => e.stopPropagation()
@ -619,6 +629,12 @@ QR =
# start with an uncached captcha # start with an uncached captcha
@reload() @reload()
<% if (type === 'userscript') { %>
# XXX Firefox lacks focusin/focusout support.
$.on input, 'blur', QR.focusout
$.on input, 'focus', QR.focusin
<% } %>
$.addClass QR.nodes.el, 'has-captcha' $.addClass QR.nodes.el, 'has-captcha'
$.after QR.nodes.com.parentNode, [imgContainer, input] $.after QR.nodes.com.parentNode, [imgContainer, input]
sync: (@captchas) -> sync: (@captchas) ->
@ -791,6 +807,14 @@ QR =
textContent: "Thread No.#{thread}" textContent: "Thread No.#{thread}"
$.after nodes.autohide, nodes.thread $.after nodes.autohide, nodes.thread
<% if (type === 'userscript') { %>
# XXX Firefox lacks focusin/focusout support.
for elm in $$ '*', QR.nodes.el
$.on elm, 'blur', QR.focusout
$.on elm, 'focus', QR.focusin
<% } %>
$.on QR.nodes.el, 'focusin', QR.focusin
$.on QR.nodes.el, 'focusout', QR.focusout
for node in [nodes.fileButton, nodes.filename.parentNode] for node in [nodes.fileButton, nodes.filename.parentNode]
$.on node, 'click', QR.openFileInput $.on node, 'click', QR.openFileInput
$.on nodes.autohide, 'change', QR.toggleHide $.on nodes.autohide, 'change', QR.toggleHide