diff --git a/4chan_x.user.js b/4chan_x.user.js
index e6fadbab0..e05a8a3af 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -1561,19 +1561,16 @@
};
updater = {
init: function() {
- var autoUpT, checked, dialog, html, input, interva, name, title, updNow, verbose, _i, _len, _ref;
- updater.interval = conf['Interval'];
- updater.ircUpd = conf['IRC Updating'];
- updater.verbose = conf['Verbose'];
- html = "
-" + updater.interval + "
";
- conf = config.updater.checkbox;
- for (name in conf) {
- title = conf[name][1];
- checked = conf[name] ? 'checked' : '';
+ var autoUpT, checkbox, checked, dialog, html, input, interva, name, title, updNow, verbose, _i, _len, _ref;
+ html = " -" + conf['Interval'] + "
";
+ checkbox = config.updater.checkbox;
+ for (name in checkbox) {
+ title = checkbox[name][1];
+ checked = checkbox[name] ? 'checked' : '';
html += "";
}
checked = conf['Auto Update'] ? 'checked' : '';
- html += " ";
+ html += " ";
dialog = ui.dialog('updater', {
bottom: '0',
right: '0'
@@ -1600,7 +1597,7 @@
},
cb: {
verbose: function() {
- if (updater.verbose = this.checked) {
+ if (conf['Verbose'] = this.checked) {
updater.count.textContent = '+0';
return $.show(updater.timer);
} else {
@@ -1619,7 +1616,7 @@
}
},
interval: function() {
- return updater.interval = this.value = this.value.match(/\d+/)[0];
+ return conf['Interval'] = this.value = parseInt(this.value) || conf['Interval'];
},
update: function() {
var arr, body, br, id, input, ircScroll, replies, reply, _i, _len, _ref, _ref2;
@@ -1649,9 +1646,9 @@
while ((reply = replies.pop()) && (reply.id > id)) {
arr.push(reply.parentNode.parentNode.parentNode);
}
- ircScroll = updater.ircUpd && arr.length && (document.height - document.body.clientHeight - window.scrollY - 20 <= 0);
- updater.timer.textContent = '-' + updater.interval;
- if (updater.verbose) {
+ ircScroll = conf['IRC Updating'] && arr.length && (document.height - document.body.clientHeight - window.scrollY - 20 <= 0);
+ updater.timer.textContent = '-' + conf['Interval'];
+ if (conf['Verbose']) {
updater.count.textContent = '+' + arr.length;
if (arr.length === 0) {
updater.count.className = '';
@@ -2134,7 +2131,6 @@
};
quotePreview = {
init: function() {
- quotePreview.hl = conf['Quote Highlighting'];
return g.callbacks.push(function(root) {
var quote, _i, _len, _ref, _results;
_ref = $$('a.quotelink, a.backlink', root);
@@ -2161,7 +2157,7 @@
id = this.hash.slice(1);
if (el = d.getElementById(id)) {
qp.innerHTML = el.innerHTML;
- if (quotePreview.hl) {
+ if (conf['Quote Highlighting']) {
$.addClass(el, 'qphl');
}
if (/backlink/.test(this.className)) {
diff --git a/script.coffee b/script.coffee
index 716a95438..17c7ae8ea 100644
--- a/script.coffee
+++ b/script.coffee
@@ -1268,21 +1268,17 @@ threadHiding =
updater =
init: ->
- updater.interval = conf['Interval']
- updater.ircUpd = conf['IRC Updating']
- updater.verbose = conf['Verbose']
-
- html = " -#{updater.interval}
"
- conf = config.updater.checkbox
- for name of conf
- title = conf[name][1]
- checked = if conf[name] then 'checked' else ''
+ html = " -#{conf['Interval']}
"
+ {checkbox} = config.updater
+ for name of checkbox
+ title = checkbox[name][1]
+ checked = if checkbox[name] then 'checked' else ''
html += ""
checked = if conf['Auto Update'] then 'checked' else ''
html += "
-
+
"
dialog = ui.dialog 'updater', bottom: '0', right: '0', html
@@ -1310,7 +1306,7 @@ updater =
cb:
verbose: ->
- if updater.verbose = @checked
+ if conf['Verbose'] = @checked
updater.count.textContent = '+0'
$.show updater.timer
else
@@ -1324,7 +1320,7 @@ updater =
else
window.clearInterval updater.intervalID
interval: ->
- updater.interval = @value = @value.match(/\d+/)[0]
+ conf['Interval'] = @value = parseInt(@value) or conf['Interval']
update: ->
if @status is 404
updater.timer.textContent = ''
@@ -1348,10 +1344,10 @@ updater =
replies = $$ 'td[id]', body
while (reply = replies.pop()) and (reply.id > id)
arr.push reply.parentNode.parentNode.parentNode #table
- ircScroll = updater.ircUpd && arr.length && (document.height - document.body.clientHeight - window.scrollY - 20 <= 0)
+ ircScroll = conf['IRC Updating'] && arr.length && (document.height - document.body.clientHeight - window.scrollY - 20 <= 0)
- updater.timer.textContent = '-' + updater.interval
- if updater.verbose
+ updater.timer.textContent = '-' + conf['Interval']
+ if conf['Verbose']
updater.count.textContent = '+' + arr.length
if arr.length is 0
updater.count.className = ''
@@ -1665,7 +1661,6 @@ quoteInline =
quotePreview =
init: ->
- quotePreview.hl = conf['Quote Highlighting']
g.callbacks.push (root) ->
for quote in $$ 'a.quotelink, a.backlink', root
continue unless quote.hash
@@ -1681,7 +1676,7 @@ quotePreview =
id = @hash[1..]
if el = d.getElementById id
qp.innerHTML = el.innerHTML
- $.addClass el, 'qphl' if quotePreview.hl
+ $.addClass el, 'qphl' if conf['Quote Highlighting']
if /backlink/.test @className
replyID = $.x('ancestor::*[@id][1]', @).id.match(/\d+/)[0]
for quote in $$ 'a.quotelink', qp