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

Append #watch only when auto watch is enabled. close #162

Browse Source
This commit is contained in:
Nicolas Stepien 2011-06-25 19:40:47 +02:00
parent 55fb350b73
commit 209e120706
3 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
4chan_x.user.js
View File

@ -1366,7 +1366,7 @@
return qr.autohide.set();
},
sys: function() {
var c, id, recaptcha, thread, _, _ref;
var c, id, otoNoko, recaptcha, thread, _, _ref;
if (recaptcha = $('#recaptcha_response_field')) {
$.bind(recaptcha, 'keydown', Recaptcha.listener);
return;
@ -1386,9 +1386,14 @@
c = $('b').lastChild;
if (c.nodeType === 8) {
_ref = c.textContent.match(/thread:(\d+),no:(\d+)/), _ = _ref[0], thread = _ref[1], id = _ref[2];
otoNoko = /AEOS.4chan_x.auto_noko=true/.test(d.cookie);
if (thread === '0') {
return window.location = "http://boards.4chan.org/" + g.BOARD + "/res/" + id + "#watch";
} else if (/AEOS.4chan_x.auto_noko=true/.test(d.cookie)) {
if (/AEOS.4chan_x.auto_watch=true/.test(d.cookie)) {
return window.location = "http://boards.4chan.org/" + g.BOARD + "/res/" + id + "#watch";
} else if (otoNoko) {
return window.location = "http://boards.4chan.org/" + g.BOARD + "/res/" + id;
}
} else if (otoNoko) {
return window.location = "http://boards.4chan.org/" + g.BOARD + "/res/" + thread + "#" + id;
}
}
@ -2684,9 +2689,9 @@
$.bind(form, 'submit', qr.cb.submit);
}
if ($.config('Auto Noko')) {
document.cookie = "" + NAMESPACE + "auto_noko=true;path=/;domain=.4chan.org";
d.cookie = "" + NAMESPACE + "auto_noko=true;path=/;domain=.4chan.org";
} else {
document.cookie = "" + NAMESPACE + "auto_noko=false;path=/;domain=.4chan.org";
d.cookie = "" + NAMESPACE + "auto_noko=false;path=/;domain=.4chan.org";
}
if ($.config('Cooldown')) {
cooldown.init();
@ -2740,6 +2745,14 @@
keybinds.init();
}
threading.init();
if ($.config('Auto Watch') && $.config('Thread Watcher')) {
d.cookie = "" + NAMESPACE + "auto_watch=true;path=/;domain=.4chan.org";
if (g.REPLY && location.hash === '#watch' && $('img.favicon').src === Favicon.empty) {
watcher.watch(null, g.THREAD_ID);
}
} else {
d.cookie = "" + NAMESPACE + "auto_watch=false;path=/;domain=.4chan.org";
}
if (g.REPLY) {
if ($.config('Thread Updater')) {
updater.init();
@ -2759,9 +2772,6 @@
if ($.config('Unread Count')) {
unread.init();
}
if ($.config('Auto Watch') && $.config('Thread Watcher') && location.hash === '#watch' && $('img.favicon').src === Favicon.empty) {
watcher.watch(null, g.THREAD_ID);
}
if ($.config('Reply Navigation')) {
nav.init();
}

1
changelog
View File

@ -3,6 +3,7 @@
- image spoiler revealer
- optional auto noko
- fix options centering on Opera
- fix append '#watch' only when auto watch is enabled
- aeosynth:
- keep options dialog at constant size
- drop firefox 3.6 support (again...)

23
script.coffee
View File

@ -1127,9 +1127,13 @@ qr =
c = $('b').lastChild
if c.nodeType is 8 #comment node
[_, thread, id] = c.textContent.match(/thread:(\d+),no:(\d+)/)
otoNoko = /AEOS.4chan_x.auto_noko=true/.test d.cookie
if thread is '0'
window.location = "http://boards.4chan.org/#{g.BOARD}/res/#{id}#watch"
else if /AEOS.4chan_x.auto_noko=true/.test d.cookie
if /AEOS.4chan_x.auto_watch=true/.test d.cookie
window.location = "http://boards.4chan.org/#{g.BOARD}/res/#{id}#watch"
else if otoNoko
window.location = "http://boards.4chan.org/#{g.BOARD}/res/#{id}"
else if otoNoko
window.location = "http://boards.4chan.org/#{g.BOARD}/res/#{thread}##{id}"
threading =
@ -2097,9 +2101,9 @@ main =
#major features
if $.config 'Auto Noko'
document.cookie = "#{NAMESPACE}auto_noko=true;path=/;domain=.4chan.org"
d.cookie = "#{NAMESPACE}auto_noko=true;path=/;domain=.4chan.org"
else
document.cookie = "#{NAMESPACE}auto_noko=false;path=/;domain=.4chan.org"
d.cookie = "#{NAMESPACE}auto_noko=false;path=/;domain=.4chan.org"
if $.config 'Cooldown'
cooldown.init()
@ -2154,6 +2158,13 @@ main =
threading.init()
if $.config('Auto Watch') and $.config('Thread Watcher')
d.cookie = "#{NAMESPACE}auto_watch=true;path=/;domain=.4chan.org"
if g.REPLY and location.hash is '#watch' and $('img.favicon').src is Favicon.empty
watcher.watch null, g.THREAD_ID
else
d.cookie = "#{NAMESPACE}auto_watch=false;path=/;domain=.4chan.org"
if g.REPLY
if $.config 'Thread Updater'
updater.init()
@ -2173,10 +2184,6 @@ main =
if $.config 'Unread Count'
unread.init()
if $.config('Auto Watch') and $.config('Thread Watcher') and
location.hash is '#watch' and $('img.favicon').src is Favicon.empty
watcher.watch null, g.THREAD_ID
if $.config 'Reply Navigation'
nav.init()