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

Merge branch 'v3'

Browse Source 
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/css/style.css
This commit is contained in:
Zixaphir 2013-09-03 16:40:40 -07:00
commit aced7b04f8
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LICENSE
View File

@ -1,5 +1,5 @@
/* /*
* appchan x - Version 2.3.10 - 2013-08-31 * appchan x - Version 2.3.10 - 2013-09-03
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE * https://github.com/zixaphir/appchan-x/blob/master/LICENSE

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

@ -20,7 +20,7 @@
// ==/UserScript== // ==/UserScript==
/* /*
* appchan x - Version 2.3.10 - 2013-08-31 * appchan x - Version 2.3.10 - 2013-09-03
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE * https://github.com/zixaphir/appchan-x/blob/master/LICENSE
@ -10275,7 +10275,7 @@
if (!(g.DEAD || ThreadUpdater.foundPost || ThreadUpdater.checkPostCount >= 5)) { if (!(g.DEAD || ThreadUpdater.foundPost || ThreadUpdater.checkPostCount >= 5)) {
return setTimeout(ThreadUpdater.update, ++ThreadUpdater.checkPostCount * $.SECOND); return setTimeout(ThreadUpdater.update, ++ThreadUpdater.checkPostCount * $.SECOND);
} }
ThreadUpdater.set('timer', ThreadUpdater.getInterval()); ThreadUpdater.setInterval();
ThreadUpdater.checkPostCount = 0; ThreadUpdater.checkPostCount = 0;
delete ThreadUpdater.foundPost; delete ThreadUpdater.foundPost;
return delete ThreadUpdater.postID; return delete ThreadUpdater.postID;

4
builds/crx/script.js
View File

@ -1,6 +1,6 @@
// Generated by CoffeeScript // Generated by CoffeeScript
/* /*
* appchan x - Version 2.3.10 - 2013-08-31 * appchan x - Version 2.3.10 - 2013-09-03
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE * https://github.com/zixaphir/appchan-x/blob/master/LICENSE
@ -10265,7 +10265,7 @@
if (!(g.DEAD || ThreadUpdater.foundPost || ThreadUpdater.checkPostCount >= 5)) { if (!(g.DEAD || ThreadUpdater.foundPost || ThreadUpdater.checkPostCount >= 5)) {
return setTimeout(ThreadUpdater.update, ++ThreadUpdater.checkPostCount * $.SECOND); return setTimeout(ThreadUpdater.update, ++ThreadUpdater.checkPostCount * $.SECOND);
} }
ThreadUpdater.set('timer', ThreadUpdater.getInterval()); ThreadUpdater.setInterval();
ThreadUpdater.checkPostCount = 0; ThreadUpdater.checkPostCount = 0;
delete ThreadUpdater.foundPost; delete ThreadUpdater.foundPost;
return delete ThreadUpdater.postID; return delete ThreadUpdater.postID;

2
src/Monitoring/ThreadUpdater.coffee
View File

@ -103,7 +103,7 @@ ThreadUpdater =
ThreadUpdater.set 'timer', '...' ThreadUpdater.set 'timer', '...'
unless g.DEAD or ThreadUpdater.foundPost or ThreadUpdater.checkPostCount >= 5 unless g.DEAD or ThreadUpdater.foundPost or ThreadUpdater.checkPostCount >= 5
return setTimeout ThreadUpdater.update, ++ThreadUpdater.checkPostCount * $.SECOND return setTimeout ThreadUpdater.update, ++ThreadUpdater.checkPostCount * $.SECOND
ThreadUpdater.set 'timer', ThreadUpdater.getInterval() ThreadUpdater.setInterval()
ThreadUpdater.checkPostCount = 0 ThreadUpdater.checkPostCount = 0
delete ThreadUpdater.foundPost delete ThreadUpdater.foundPost
delete ThreadUpdater.postID delete ThreadUpdater.postID