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

I'm merging it, otherwise auto watch would not work with auto noko disabled.

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

Conflicts:
	4chan_x.user.js
	script.coffee
This commit is contained in:
Nicolas Stepien 2011-08-01 05:10:52 +02:00
commit affb58c14d
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
4chan_x.user.js
View File

@ -100,7 +100,8 @@
'Auto Noko': [true, 'Always redirect to your post'],
'Cooldown': [true, 'Prevent \'flood detected\' errors'],
'Quick Reply': [true, 'Reply without leaving the page'],
'Persistent QR': [false, 'Quick reply won\'t disappear after posting. Only in replies.']
'Persistent QR': [false, 'Quick reply won\'t disappear after posting. Only in replies.'],
'Auto Hide QR': [true, 'Automatically auto-hide the quick reply when posting']
},
Quoting: {
'Quote Backlinks': [true, 'Add quote backlinks'],
@ -1312,7 +1313,9 @@
this.submit();
}
$('#error', qr.el).textContent = '';
qr.autohide.set();
if (conf['Auto Hide QR']) {
qr.autohide.set();
}
return qr.sage = /sage/i.test($('input[name=email]', this).value);
}
},
@ -1371,7 +1374,9 @@
},
persist: function() {
qr.dialog();
return qr.autohide.set();
if (conf['Auto Hide QR']) {
return qr.autohide.set();
}
},
close: function() {
$.rm(qr.el);
@ -2442,7 +2447,9 @@
}
if (e.keyCode === 13 && cooldown.duration) {
$('#auto', qr.el).checked = true;
return qr.autohide.set();
if (conf['Auto Hide QR']) {
return qr.autohide.set();
}
}
},
reload: function() {

7
script.coffee
View File

@ -34,6 +34,7 @@ config =
'Cooldown': [true, 'Prevent \'flood detected\' errors']
'Quick Reply': [true, 'Reply without leaving the page']
'Persistent QR': [false, 'Quick reply won\'t disappear after posting. Only in replies.']
'Auto Hide QR': [true, 'Automatically auto-hide the quick reply when posting']
Quoting:
'Quote Backlinks': [true, 'Add quote backlinks']
'OP Backlinks': [false, 'Add backlinks to the OP']
@ -1027,7 +1028,7 @@ qr =
else if isQR
if !e then @submit()
$('#error', qr.el).textContent = ''
qr.autohide.set()
qr.autohide.set() if conf['Auto Hide QR']
qr.sage = /sage/i.test $('input[name=email]', @).value
quote: (link) ->
@ -1100,7 +1101,7 @@ qr =
persist: ->
qr.dialog()
qr.autohide.set()
qr.autohide.set() if conf['Auto Hide QR']
close: ->
$.rm qr.el
@ -1846,7 +1847,7 @@ Recaptcha =
Recaptcha.reload()
if e.keyCode is 13 and cooldown.duration # press enter to enable auto-post if cooldown is still running
$('#auto', qr.el).checked = true
qr.autohide.set()
qr.autohide.set() if conf['Auto Hide QR']
reload: ->
window.location = 'javascript:Recaptcha.reload()'
reloaded: (e) ->