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

Divide hide function into un/hide/toggle.

Browse Source
This commit is contained in:
Nicolas Stepien 2012-01-25 03:59:01 +01:00
parent 53d3197c6a
commit 5dbc9a2480
2 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
4chan_x.user.js
View File

@ -1202,7 +1202,7 @@
}));
if (conf['Persistent QR']) {
qr.dialog();
if (conf['Auto Hide QR']) $.id('autohide').click();
if (conf['Auto Hide QR']) qr.hide();
}
$.on(d, 'dragover', qr.fileDrop);
$.on(d, 'drop', qr.fileDrop);
@ -1211,8 +1211,7 @@
open: function() {
if (qr.el) {
qr.el.hidden = false;
$.id('autohide').checked = false;
return qr.hide();
return qr.unhide();
} else {
return qr.dialog();
}
@ -1236,11 +1235,21 @@
return qr.cleanError();
},
hide: function() {
if ($.id('autohide').checked) {
return $.addClass(qr.el, 'autohide');
} else {
$.removeClass(qr.el, 'autohide');
var auto;
auto = $.id('autohide');
if (!auto.checked) return auto.click();
},
unhide: function() {
var auto;
auto = $.id('autohide');
if (auto.checked) return auto.click();
},
toggleHide: function() {
if (this.checked) {
$.addClass(qr.el, 'autohide');
return d.activeElement.blur();
} else {
return $.removeClass(qr.el, 'autohide');
}
},
error: function(err, node) {
@ -1522,7 +1531,7 @@
return e.stopPropagation();
});
}
$.on($('#autohide', qr.el), 'click', qr.hide);
$.on($('#autohide', qr.el), 'click', qr.toggleHide);
$.on($('.close', qr.el), 'click', qr.close);
$.on($('#dump', qr.el), 'click', function() {
return qr.el.classList.toggle('dump');
@ -1583,10 +1592,7 @@
}
qr.cleanError();
threadID = g.THREAD_ID || $('select', qr.el).value;
if (conf['Auto Hide QR'] && qr.replies.length === 1) {
$.id('autohide').checked = true;
qr.hide();
}
if (conf['Auto Hide QR'] && qr.replies.length === 1) qr.hide();
if (conf['Thread Watcher'] && conf['Auto Watch Reply'] && threadID !== 'new') {
watcher.watch(threadID);
}

20
script.coffee
View File

@ -867,7 +867,7 @@ qr =
src: 'http://sys.4chan.org/post'
if conf['Persistent QR']
qr.dialog()
$.id('autohide').click() if conf['Auto Hide QR']
qr.hide() if conf['Auto Hide QR']
$.on d, 'dragover', qr.fileDrop
$.on d, 'drop', qr.fileDrop
# prevent original captcha input from being focused on reload
@ -876,8 +876,7 @@ qr =
open: ->
if qr.el
qr.el.hidden = false
$.id('autohide').checked = false
qr.hide()
qr.unhide()
else
qr.dialog()
close: ->
@ -892,11 +891,17 @@ qr =
spoiler.click() if (spoiler = $.id 'spoiler').checked
qr.cleanError()
hide: ->
if $.id('autohide').checked
$.addClass qr.el, 'autohide'
auto = $.id('autohide')
auto.click() unless auto.checked
unhide: ->
auto = $.id('autohide')
auto.click() if auto.checked
toggleHide: ->
if @checked
$.addClass qr.el, 'autohide'
d.activeElement.blur()
else
$.removeClass qr.el, 'autohide'
d.activeElement.blur()
error: (err, node) ->
el = $('.error', qr.el)
@ -1124,7 +1129,7 @@ qr =
</form>"
unless g.REPLY
$.on $('select', qr.el), 'mousedown', (e) -> e.stopPropagation()
$.on $('#autohide', qr.el), 'click', qr.hide
$.on $('#autohide', qr.el), 'click', qr.toggleHide
$.on $('.close', qr.el), 'click', qr.close
$.on $('#dump', qr.el), 'click', -> qr.el.classList.toggle 'dump'
$.on $('#addReply', qr.el), 'click', -> new qr.reply().select()
@ -1182,7 +1187,6 @@ qr =
threadID = g.THREAD_ID or $('select', qr.el).value
if conf['Auto Hide QR'] and qr.replies.length is 1
$.id('autohide').checked = true
qr.hide()
if conf['Thread Watcher'] and conf['Auto Watch Reply'] and threadID isnt 'new'
watcher.watch threadID