Merge branch 'v3'

Conflicts:
	builds/4chan-X.user.js
This commit is contained in:
Zixaphir 2013-10-13 14:49:34 -07:00
commit ad453f1dee
3 changed files with 9 additions and 12 deletions

View File

@ -10283,11 +10283,10 @@
ThreadUpdater.outdateCount = 0;
ThreadUpdater.setInterval();
ThreadUpdater.set('status', null, null);
} else {
ThreadUpdater.set('timer', null);
ThreadUpdater.set('status', 'Offline', 'warning');
return;
}
return ThreadUpdater.cb.autoUpdate();
ThreadUpdater.set('timer', null);
return ThreadUpdater.set('status', 'Offline', 'warning');
},
post: function(e) {
if (!(ThreadUpdater.isUpdating && e.detail.threadID === ThreadUpdater.thread.ID)) {

View File

@ -10273,11 +10273,10 @@
ThreadUpdater.outdateCount = 0;
ThreadUpdater.setInterval();
ThreadUpdater.set('status', null, null);
} else {
ThreadUpdater.set('timer', null);
ThreadUpdater.set('status', 'Offline', 'warning');
return;
}
return ThreadUpdater.cb.autoUpdate();
ThreadUpdater.set('timer', null);
return ThreadUpdater.set('status', 'Offline', 'warning');
},
post: function(e) {
if (!(ThreadUpdater.isUpdating && e.detail.threadID === ThreadUpdater.thread.ID)) {

View File

@ -85,10 +85,9 @@ ThreadUpdater =
ThreadUpdater.outdateCount = 0
ThreadUpdater.setInterval()
ThreadUpdater.set 'status', null, null
else
ThreadUpdater.set 'timer', null
ThreadUpdater.set 'status', 'Offline', 'warning'
ThreadUpdater.cb.autoUpdate()
return
ThreadUpdater.set 'timer', null
ThreadUpdater.set 'status', 'Offline', 'warning'
post: (e) ->
return unless ThreadUpdater.isUpdating and e.detail.threadID is ThreadUpdater.thread.ID
ThreadUpdater.outdateCount = 0