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-10-13 17:33:11 -07:00
commit cfda90a532
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10320,7 +10320,7 @@
} }
ThreadUpdater.outdateCount = 0; ThreadUpdater.outdateCount = 0;
if (ThreadUpdater.seconds > ThreadUpdater.interval) { if (ThreadUpdater.seconds > ThreadUpdater.interval) {
return ThreadUpdater.set('timer', ThreadUpdater.getInterval()); return ThreadUpdater.setInterval();
} }
}, },
scrollBG: function() { scrollBG: function() {
@ -10348,7 +10348,7 @@
case 200: case 200:
g.DEAD = false; g.DEAD = false;
ThreadUpdater.parse(JSON.parse(req.response).posts); ThreadUpdater.parse(JSON.parse(req.response).posts);
ThreadUpdater.set('timer', ThreadUpdater.getInterval()); ThreadUpdater.setInterval();
break; break;
case 404: case 404:
g.DEAD = true; g.DEAD = true;
@ -10363,7 +10363,7 @@
break; break;
default: default:
ThreadUpdater.outdateCount++; ThreadUpdater.outdateCount++;
ThreadUpdater.set('timer', ThreadUpdater.getInterval()); ThreadUpdater.setInterval();
_ref = req.status === 304 ? [null, null] : ["" + req.statusText + " (" + req.status + ")", 'warning'], text = _ref[0], klass = _ref[1]; _ref = req.status === 304 ? [null, null] : ["" + req.statusText + " (" + req.status + ")", 'warning'], text = _ref[0], klass = _ref[1];
ThreadUpdater.set('status', text, klass); ThreadUpdater.set('status', text, klass);
} }

6
builds/crx/script.js
View File

@ -10310,7 +10310,7 @@
} }
ThreadUpdater.outdateCount = 0; ThreadUpdater.outdateCount = 0;
if (ThreadUpdater.seconds > ThreadUpdater.interval) { if (ThreadUpdater.seconds > ThreadUpdater.interval) {
return ThreadUpdater.set('timer', ThreadUpdater.getInterval()); return ThreadUpdater.setInterval();
} }
}, },
scrollBG: function() { scrollBG: function() {
@ -10338,7 +10338,7 @@
case 200: case 200:
g.DEAD = false; g.DEAD = false;
ThreadUpdater.parse(JSON.parse(req.response).posts); ThreadUpdater.parse(JSON.parse(req.response).posts);
ThreadUpdater.set('timer', ThreadUpdater.getInterval()); ThreadUpdater.setInterval();
break; break;
case 404: case 404:
g.DEAD = true; g.DEAD = true;
@ -10353,7 +10353,7 @@
break; break;
default: default:
ThreadUpdater.outdateCount++; ThreadUpdater.outdateCount++;
ThreadUpdater.set('timer', ThreadUpdater.getInterval()); ThreadUpdater.setInterval();
_ref = req.status === 304 ? [null, null] : ["" + req.statusText + " (" + req.status + ")", 'warning'], text = _ref[0], klass = _ref[1]; _ref = req.status === 304 ? [null, null] : ["" + req.statusText + " (" + req.status + ")", 'warning'], text = _ref[0], klass = _ref[1];
ThreadUpdater.set('status', text, klass); ThreadUpdater.set('status', text, klass);
} }

6
src/Monitoring/ThreadUpdater.coffee
View File

@ -109,7 +109,7 @@ ThreadUpdater =
# Reset the counter when we focus this tab. # Reset the counter when we focus this tab.
ThreadUpdater.outdateCount = 0 ThreadUpdater.outdateCount = 0
if ThreadUpdater.seconds > ThreadUpdater.interval if ThreadUpdater.seconds > ThreadUpdater.interval
ThreadUpdater.set 'timer', ThreadUpdater.getInterval() ThreadUpdater.setInterval()
scrollBG: -> scrollBG: ->
ThreadUpdater.scrollBG = if Conf['Scroll BG'] ThreadUpdater.scrollBG = if Conf['Scroll BG']
-> true -> true
@ -126,7 +126,7 @@ ThreadUpdater =
when 200 when 200
g.DEAD = false g.DEAD = false
ThreadUpdater.parse JSON.parse(req.response).posts ThreadUpdater.parse JSON.parse(req.response).posts
ThreadUpdater.set 'timer', ThreadUpdater.getInterval() ThreadUpdater.setInterval()
when 404 when 404
g.DEAD = true g.DEAD = true
ThreadUpdater.set 'timer', null ThreadUpdater.set 'timer', null
@ -138,7 +138,7 @@ ThreadUpdater =
thread: ThreadUpdater.thread thread: ThreadUpdater.thread
else else
ThreadUpdater.outdateCount++ ThreadUpdater.outdateCount++
ThreadUpdater.set 'timer', ThreadUpdater.getInterval() ThreadUpdater.setInterval()
[text, klass] = if req.status is 304 [text, klass] = if req.status is 304
[null, null] [null, null]
else else