From a65faabcbe8a4bf07571ab272157b73a06b8d02a Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Wed, 25 Jan 2012 19:19:54 +0100 Subject: [PATCH] Small refactor. --- 4chan_x.user.js | 11 ++++------- script.coffee | 8 +++----- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 0aeb4725f..ffd767116 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -1273,10 +1273,8 @@ status: function(data) { var disabled, input, value; if (data == null) data = {}; - input = qr.status.input; if (data.ready) { qr.status.ready = true; - if (!qr.el) return; } else if (!qr.status.ready) { value = 'Loading'; disabled = true; @@ -1287,6 +1285,8 @@ } else if (data.progress) { value = data.progress; } + if (!qr.el) return; + input = qr.status.input; input.value = value || 'Submit'; return input.disabled = disabled || false; }, @@ -2223,18 +2223,15 @@ } }, update: function() { - var body, frag, id, input, newPosts, reply, scroll, _i, _len, _ref, _ref2; + var body, frag, id, newPosts, reply, scroll, _i, _len, _ref, _ref2; if (this.status === 404) { updater.timer.textContent = ''; updater.count.textContent = 404; updater.count.className = 'error'; clearTimeout(updater.timeoutID); - if (input = $('#qr [type=submit]', qr.el)) { - input.disabled = true; - input.value = 404; - } d.title = d.title.match(/^.+-/)[0] + ' 404'; g.dead = true; + qr.status(); Favicon.update(); return; } diff --git a/script.coffee b/script.coffee index b1eb5c05e..4ef1c8498 100644 --- a/script.coffee +++ b/script.coffee @@ -915,10 +915,8 @@ qr = $('.error', qr.el).textContent = null status: (data={}) -> - {input} = qr.status if data.ready qr.status.ready = true - return unless qr.el else unless qr.status.ready value = 'Loading' disabled = true @@ -927,6 +925,8 @@ qr = disabled = true else if data.progress value = data.progress + return unless qr.el + {input} = qr.status input.value = value or 'Submit' input.disabled = disabled or false @@ -1722,11 +1722,9 @@ updater = updater.count.textContent = 404 updater.count.className = 'error' clearTimeout updater.timeoutID - if input = $ '#qr [type=submit]', qr.el - input.disabled = true - input.value = 404 d.title = d.title.match(/^.+-/)[0] + ' 404' g.dead = true + qr.status() Favicon.update() return