diff --git a/4chan_x.user.js b/4chan_x.user.js index 8cd5a2755..e6fadbab0 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -1622,7 +1622,7 @@ return updater.interval = this.value = this.value.match(/\d+/)[0]; }, update: function() { - var arr, body, br, id, input, length, replies, reply, _i, _len, _ref, _ref2; + var arr, body, br, id, input, ircScroll, replies, reply, _i, _len, _ref, _ref2; if (this.status === 404) { updater.timer.textContent = ''; updater.count.textContent = 404; @@ -1649,11 +1649,11 @@ while ((reply = replies.pop()) && (reply.id > id)) { arr.push(reply.parentNode.parentNode.parentNode); } - length = arr.length; + ircScroll = updater.ircUpd && arr.length && (document.height - document.body.clientHeight - window.scrollY - 20 <= 0); updater.timer.textContent = '-' + updater.interval; if (updater.verbose) { - updater.count.textContent = '+' + length; - if (length === 0) { + updater.count.textContent = '+' + arr.length; + if (arr.length === 0) { updater.count.className = ''; } else { updater.count.className = 'new'; @@ -1662,7 +1662,7 @@ while (reply = arr.pop()) { $.before(br, reply); } - if (updater.ircUpd && length) { + if (ircScroll) { return scrollTo(0, d.body.scrollHeight); } } diff --git a/script.coffee b/script.coffee index 1ef760fac..716a95438 100644 --- a/script.coffee +++ b/script.coffee @@ -1348,12 +1348,12 @@ updater = replies = $$ 'td[id]', body while (reply = replies.pop()) and (reply.id > id) arr.push reply.parentNode.parentNode.parentNode #table - length = arr.length + ircScroll = updater.ircUpd && arr.length && (document.height - document.body.clientHeight - window.scrollY - 20 <= 0) updater.timer.textContent = '-' + updater.interval if updater.verbose - updater.count.textContent = '+' + length - if length is 0 + updater.count.textContent = '+' + arr.length + if arr.length is 0 updater.count.className = '' else updater.count.className = 'new' @@ -1361,7 +1361,7 @@ updater = #XXX add replies in correct order so backlinks resolve while reply = arr.pop() $.before br, reply - if updater.ircUpd && length + if ircScroll scrollTo 0, d.body.scrollHeight timeout: ->