From c7d2021895bb5effb00ea2872ba72e4cafe701ca Mon Sep 17 00:00:00 2001 From: Zixaphir Date: Tue, 3 Sep 2013 17:27:18 -0700 Subject: [PATCH 1/2] Place remove spoilers after Linkify --- builds/4chan-X.user.js | 2 +- builds/crx/script.js | 2 +- src/General/Main.coffee | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 08e539311..cec78313a 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -11493,9 +11493,9 @@ 'Fourchan thingies': Fourchan, 'Emoji': Emoji, 'Color User IDs': IDColor, - 'Reveal Spoilers': RemoveSpoilers, 'Custom CSS': CustomCSS, 'Linkify': Linkify, + 'Reveal Spoilers': RemoveSpoilers, 'Resurrect Quotes': Quotify, 'Filter': Filter, 'Thread Hiding Buttons': ThreadHiding, diff --git a/builds/crx/script.js b/builds/crx/script.js index 0776618c7..433ea6c6a 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -11484,9 +11484,9 @@ 'Fourchan thingies': Fourchan, 'Emoji': Emoji, 'Color User IDs': IDColor, - 'Reveal Spoilers': RemoveSpoilers, 'Custom CSS': CustomCSS, 'Linkify': Linkify, + 'Reveal Spoilers': RemoveSpoilers, 'Resurrect Quotes': Quotify, 'Filter': Filter, 'Thread Hiding Buttons': ThreadHiding, diff --git a/src/General/Main.coffee b/src/General/Main.coffee index e3d420d5b..50303d0af 100755 --- a/src/General/Main.coffee +++ b/src/General/Main.coffee @@ -83,9 +83,9 @@ Main = 'Fourchan thingies': Fourchan 'Emoji': Emoji 'Color User IDs': IDColor - 'Reveal Spoilers': RemoveSpoilers 'Custom CSS': CustomCSS 'Linkify': Linkify + 'Reveal Spoilers': RemoveSpoilers 'Resurrect Quotes': Quotify 'Filter': Filter 'Thread Hiding Buttons': ThreadHiding From 720606d2e22a4529df9e7c9838603aa37fe97bfb Mon Sep 17 00:00:00 2001 From: Zixaphir Date: Tue, 3 Sep 2013 21:41:00 -0700 Subject: [PATCH 2/2] Trick thread updater into allowing 1 second PROTIP: minimum seconds are now techically two, but it'll still display one. Anyone pissed about this needs to get a life. --- builds/4chan-X.user.js | 2 +- builds/crx/script.js | 2 +- src/Monitoring/ThreadUpdater.coffee | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index cec78313a..44fb48b31 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -8056,7 +8056,7 @@ j = j < 7 ? j : 7; } ThreadUpdater.seconds = Conf['Optional Increase'] ? (cur = [0, 5, 10, 15, 20, 30, 60, 90, 120, 240, 300][j] > i) ? cur : i : i; - ThreadUpdater.set('timer', ThreadUpdater.seconds); + ThreadUpdater.set('timer', ThreadUpdater.seconds++); clearTimeout(ThreadUpdater.timeoutID); return ThreadUpdater.timeout(); }, diff --git a/builds/crx/script.js b/builds/crx/script.js index 433ea6c6a..bd8c52a2e 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -8043,7 +8043,7 @@ j = j < 7 ? j : 7; } ThreadUpdater.seconds = Conf['Optional Increase'] ? (cur = [0, 5, 10, 15, 20, 30, 60, 90, 120, 240, 300][j] > i) ? cur : i : i; - ThreadUpdater.set('timer', ThreadUpdater.seconds); + ThreadUpdater.set('timer', ThreadUpdater.seconds++); clearTimeout(ThreadUpdater.timeoutID); return ThreadUpdater.timeout(); }, diff --git a/src/Monitoring/ThreadUpdater.coffee b/src/Monitoring/ThreadUpdater.coffee index 4cc268029..32c5c668b 100755 --- a/src/Monitoring/ThreadUpdater.coffee +++ b/src/Monitoring/ThreadUpdater.coffee @@ -175,7 +175,7 @@ ThreadUpdater = if cur = [0, 5, 10, 15, 20, 30, 60, 90, 120, 240, 300][j] > i then cur else i else i - ThreadUpdater.set 'timer', ThreadUpdater.seconds + ThreadUpdater.set 'timer', ThreadUpdater.seconds++ clearTimeout ThreadUpdater.timeoutID ThreadUpdater.timeout()