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

Merge branch 'master' into QR

Browse Source
This commit is contained in:
James Campos 2011-09-04 12:35:42 -07:00
commit d914aa0f52
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
4chan_x.user.js
View File

@ -2203,6 +2203,13 @@
$.before(input, favicon); $.before(input, favicon);
} }
watcher.refresh(); watcher.refresh();
if (conf['Auto Watch']) {
if (!g.REPLY) {
$('.postarea form').action += '?watch';
} else if (/watch/.test(location.search) && $('img.favicon').src === Favicon.empty) {
watcher.watch(null, g.THREAD_ID);
}
}
return $.bind(window, 'storage', function(e) { return $.bind(window, 'storage', function(e) {
if (e.key === ("" + NAMESPACE + "watched")) { if (e.key === ("" + NAMESPACE + "watched")) {
return watcher.refresh(); return watcher.refresh();
@ -3152,7 +3159,7 @@
return; return;
} }
Favicon.halo = /ws/.test(Favicon["default"]) ? Favicon.haloSFW : Favicon.haloNSFW; Favicon.halo = /ws/.test(Favicon["default"]) ? Favicon.haloSFW : Favicon.haloNSFW;
$('link[rel="shortcut icon"]', d.head).setAttribute('type', 'image/x-icon'); $('link[rel="shortcut icon"]', d.head).type = 'image/x-icon';
g.hiddenReplies = $.get("hiddenReplies/" + g.BOARD + "/", {}); g.hiddenReplies = $.get("hiddenReplies/" + g.BOARD + "/", {});
tzOffset = (new Date()).getTimezoneOffset() / 60; tzOffset = (new Date()).getTimezoneOffset() / 60;
g.chanOffset = 5 - tzOffset; g.chanOffset = 5 - tzOffset;
@ -3211,7 +3218,7 @@
if (conf['Sauce']) { if (conf['Sauce']) {
sauce.init(); sauce.init();
} }
if (conf['Reveal Spoilers']) { if (conf['Reveal Spoilers'] && $('.postarea label')) {
revealSpoilers.init(); revealSpoilers.init();
} }
if (conf['Anonymize']) { if (conf['Anonymize']) {
@ -3266,9 +3273,6 @@
if (conf['Reply Navigation']) { if (conf['Reply Navigation']) {
nav.init(); nav.init();
} }
if (conf['Auto Watch'] && conf['Thread Watcher'] && /watch/.test(location.search) && $('img.favicon').src === Favicon.empty) {
watcher.watch(null, g.THREAD_ID);
}
} else { } else {
if (conf['Index Navigation']) { if (conf['Index Navigation']) {
nav.init(); nav.init();
@ -3282,9 +3286,6 @@
if (conf['Comment Expansion']) { if (conf['Comment Expansion']) {
expandComment.init(); expandComment.init();
} }
if (conf['Auto Watch']) {
$('.postarea form').action += '?watch';
}
} }
_ref3 = $$('div.op'); _ref3 = $$('div.op');
for (_i = 0, _len = _ref3.length; _i < _len; _i++) { for (_i = 0, _len = _ref3.length; _i < _len; _i++) {

17
script.coffee
View File

@ -1796,6 +1796,12 @@ watcher =
#populate watcher, display watch buttons #populate watcher, display watch buttons
watcher.refresh() watcher.refresh()
if conf['Auto Watch']
unless g.REPLY
$('.postarea form').action += '?watch'
else if /watch/.test(location.search) and $('img.favicon').src is Favicon.empty
watcher.watch null, g.THREAD_ID
$.bind window, 'storage', (e) -> watcher.refresh() if e.key is "#{NAMESPACE}watched" $.bind window, 'storage', (e) -> watcher.refresh() if e.key is "#{NAMESPACE}watched"
refresh: -> refresh: ->
@ -2471,7 +2477,7 @@ main =
return return
Favicon.halo = if /ws/.test Favicon.default then Favicon.haloSFW else Favicon.haloNSFW Favicon.halo = if /ws/.test Favicon.default then Favicon.haloSFW else Favicon.haloNSFW
$('link[rel="shortcut icon"]', d.head).setAttribute 'type', 'image/x-icon' $('link[rel="shortcut icon"]', d.head).type = 'image/x-icon'
g.hiddenReplies = $.get "hiddenReplies/#{g.BOARD}/", {} g.hiddenReplies = $.get "hiddenReplies/#{g.BOARD}/", {}
tzOffset = (new Date()).getTimezoneOffset() / 60 tzOffset = (new Date()).getTimezoneOffset() / 60
# GMT -8 is given as +480; would GMT +8 be -480 ? # GMT -8 is given as +480; would GMT +8 be -480 ?
@ -2528,7 +2534,7 @@ main =
if conf['Sauce'] if conf['Sauce']
sauce.init() sauce.init()
if conf['Reveal Spoilers'] if conf['Reveal Spoilers'] and $('.postarea label')
revealSpoilers.init() revealSpoilers.init()
if conf['Anonymize'] if conf['Anonymize']
@ -2583,10 +2589,6 @@ main =
if conf['Reply Navigation'] if conf['Reply Navigation']
nav.init() nav.init()
if conf['Auto Watch'] and conf['Thread Watcher'] and
/watch/.test(location.search) and $('img.favicon').src is Favicon.empty
watcher.watch null, g.THREAD_ID
else #not reply else #not reply
if conf['Index Navigation'] if conf['Index Navigation']
nav.init() nav.init()
@ -2600,9 +2602,6 @@ main =
if conf['Comment Expansion'] if conf['Comment Expansion']
expandComment.init() expandComment.init()
if conf['Auto Watch']
$('.postarea form').action += '?watch'
for op in $$ 'div.op' for op in $$ 'div.op'
for callback in g.callbacks for callback in g.callbacks
callback op callback op