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

Merge branch 'v3'

Browse Source 
Conflicts:
	builds/4chan-X.user.js
This commit is contained in:
Zixaphir 2013-09-03 21:42:41 -07:00
commit a5471ba547
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builds/appchan-x.user.js
View File

@ -10363,7 +10363,7 @@
j = j < 7 ? j : 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.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); clearTimeout(ThreadUpdater.timeoutID);
return ThreadUpdater.timeout(); return ThreadUpdater.timeout();
}, },
@ -15775,9 +15775,9 @@
'Announcement Hiding': PSAHiding, 'Announcement Hiding': PSAHiding,
'Fourchan thingies': Fourchan, 'Fourchan thingies': Fourchan,
'Color User IDs': IDColor, 'Color User IDs': IDColor,
'Reveal Spoilers': RemoveSpoilers,
'Custom CSS': CustomCSS, 'Custom CSS': CustomCSS,
'Linkify': Linkify, 'Linkify': Linkify,
'Reveal Spoilers': RemoveSpoilers,
'Resurrect Quotes': Quotify, 'Resurrect Quotes': Quotify,
'Filter': Filter, 'Filter': Filter,
'Thread Hiding Buttons': ThreadHiding, 'Thread Hiding Buttons': ThreadHiding,

4
builds/crx/script.js
View File

@ -10353,7 +10353,7 @@
j = j < 7 ? j : 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.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); clearTimeout(ThreadUpdater.timeoutID);
return ThreadUpdater.timeout(); return ThreadUpdater.timeout();
}, },
@ -15763,9 +15763,9 @@
'Announcement Hiding': PSAHiding, 'Announcement Hiding': PSAHiding,
'Fourchan thingies': Fourchan, 'Fourchan thingies': Fourchan,
'Color User IDs': IDColor, 'Color User IDs': IDColor,
'Reveal Spoilers': RemoveSpoilers,
'Custom CSS': CustomCSS, 'Custom CSS': CustomCSS,
'Linkify': Linkify, 'Linkify': Linkify,
'Reveal Spoilers': RemoveSpoilers,
'Resurrect Quotes': Quotify, 'Resurrect Quotes': Quotify,
'Filter': Filter, 'Filter': Filter,
'Thread Hiding Buttons': ThreadHiding, 'Thread Hiding Buttons': ThreadHiding,

2
src/General/Main.coffee
View File

@ -122,9 +122,9 @@ Main =
'Announcement Hiding': PSAHiding 'Announcement Hiding': PSAHiding
'Fourchan thingies': Fourchan 'Fourchan thingies': Fourchan
'Color User IDs': IDColor 'Color User IDs': IDColor
'Reveal Spoilers': RemoveSpoilers
'Custom CSS': CustomCSS 'Custom CSS': CustomCSS
'Linkify': Linkify 'Linkify': Linkify
'Reveal Spoilers': RemoveSpoilers
'Resurrect Quotes': Quotify 'Resurrect Quotes': Quotify
'Filter': Filter 'Filter': Filter
'Thread Hiding Buttons': ThreadHiding 'Thread Hiding Buttons': ThreadHiding

2
src/Monitoring/ThreadUpdater.coffee
View File

@ -176,7 +176,7 @@ ThreadUpdater =
if cur = [0, 5, 10, 15, 20, 30, 60, 90, 120, 240, 300][j] > i then cur else i if cur = [0, 5, 10, 15, 20, 30, 60, 90, 120, 240, 300][j] > i then cur else i
else else
i i
ThreadUpdater.set 'timer', ThreadUpdater.seconds ThreadUpdater.set 'timer', ThreadUpdater.seconds++
clearTimeout ThreadUpdater.timeoutID clearTimeout ThreadUpdater.timeoutID
ThreadUpdater.timeout() ThreadUpdater.timeout()