Merge branch 'master' into menu

This commit is contained in:
Nicolas Stepien 2012-07-02 20:55:56 +02:00
commit 0379b4400b
2 changed files with 7 additions and 6 deletions

View File

@ -2795,7 +2795,7 @@
}; };
}, },
update: function() { update: function() {
var count, doc, id, lastPost, nodes, reply, scroll, _i, _len, _ref; var count, doc, id, lastPost, nodes, reply, scroll, _i, _len, _ref, _ref1;
if (this.status === 404) { if (this.status === 404) {
Updater.timer.textContent = ''; Updater.timer.textContent = '';
Updater.count.textContent = 404; Updater.count.textContent = 404;
@ -2811,7 +2811,7 @@
QR.abort(); QR.abort();
return; return;
} }
if (this.status !== 200 && this.status !== 304) { if ((_ref = this.status) !== 0 && _ref !== 200 && _ref !== 304) {
Updater.retryCoef += 10 * (Updater.retryCoef < 120); Updater.retryCoef += 10 * (Updater.retryCoef < 120);
if (Conf['Verbose']) { if (Conf['Verbose']) {
Updater.count.textContent = this.statusText; Updater.count.textContent = this.statusText;
@ -2841,9 +2841,9 @@
lastPost = Updater.thread.lastElementChild; lastPost = Updater.thread.lastElementChild;
id = lastPost.id.slice(2); id = lastPost.id.slice(2);
nodes = []; nodes = [];
_ref = $$('.replyContainer', doc).reverse(); _ref1 = $$('.replyContainer', doc).reverse();
for (_i = 0, _len = _ref.length; _i < _len; _i++) { for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
reply = _ref[_i]; reply = _ref1[_i];
if (reply.id.slice(2) <= id) { if (reply.id.slice(2) <= id) {
break; break;
} }

View File

@ -2217,7 +2217,8 @@ Updater =
Unread.update true Unread.update true
QR.abort() QR.abort()
return return
if @status isnt 200 and @status isnt 304 unless @status in [0, 200, 304]
# XXX 304 -> 0 in Opera
Updater.retryCoef += 10 * (Updater.retryCoef < 120) Updater.retryCoef += 10 * (Updater.retryCoef < 120)
if Conf['Verbose'] if Conf['Verbose']
Updater.count.textContent = @statusText Updater.count.textContent = @statusText