Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:aeosynth/4chan-x

Browse Source 
Conflicts:
	4chan_x.user.js
	script.coffee
This commit is contained in:
Nicolas Stepien 2011-07-24 04:40:19 +02:00
commit 011d45da06
2 changed files with 25 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
4chan_x.user.js
View File

@ -1561,19 +1561,16 @@
}; };
updater = { updater = {
init: function() { init: function() {
var autoUpT, checked, dialog, html, input, interva, name, title, updNow, verbose, _i, _len, _ref; var autoUpT, checkbox, checked, dialog, html, input, interva, name, title, updNow, verbose, _i, _len, _ref;
updater.interval = conf['Interval']; html = "<div class=move><span id=count></span> <span id=timer>-" + conf['Interval'] + "</span></div>";
updater.ircUpd = conf['IRC Updating']; checkbox = config.updater.checkbox;
updater.verbose = conf['Verbose']; for (name in checkbox) {
html = "<div class=move><span id=count></span> <span id=timer>-" + updater.interval + "</span></div>"; title = checkbox[name][1];
conf = config.updater.checkbox; checked = checkbox[name] ? 'checked' : '';
for (name in conf) {
title = conf[name][1];
checked = conf[name] ? 'checked' : '';
html += "<div><label title='" + title + "'>" + name + "<input name='" + name + "' type=checkbox " + checked + "></label></div>"; html += "<div><label title='" + title + "'>" + name + "<input name='" + name + "' type=checkbox " + checked + "></label></div>";
} }
checked = conf['Auto Update'] ? 'checked' : ''; checked = conf['Auto Update'] ? 'checked' : '';
html += " <div><label title='Controls whether *this* thread auotmatically updates or not'>Auto Update This<input name='Auto Update This' type=checkbox " + checked + "></label></div> <div><label>Interval (s)<input name=Interval value=" + updater.interval + " type=text></label></div> <div><input value='Update Now' type=button></div>"; html += " <div><label title='Controls whether *this* thread auotmatically updates or not'>Auto Update This<input name='Auto Update This' type=checkbox " + checked + "></label></div> <div><label>Interval (s)<input name=Interval value=" + conf['Interval'] + " type=text></label></div> <div><input value='Update Now' type=button></div>";
dialog = ui.dialog('updater', { dialog = ui.dialog('updater', {
bottom: '0', bottom: '0',
right: '0' right: '0'
@ -1600,7 +1597,7 @@
}, },
cb: { cb: {
verbose: function() { verbose: function() {
if (updater.verbose = this.checked) { if (conf['Verbose'] = this.checked) {
updater.count.textContent = '+0'; updater.count.textContent = '+0';
return $.show(updater.timer); return $.show(updater.timer);
} else { } else {
@ -1619,7 +1616,7 @@
} }
}, },
interval: function() { interval: function() {
return updater.interval = this.value = this.value.match(/\d+/)[0]; return conf['Interval'] = this.value = parseInt(this.value) || conf['Interval'];
}, },
update: function() { update: function() {
var arr, body, br, id, input, ircScroll, replies, reply, _i, _len, _ref, _ref2; var arr, body, br, id, input, ircScroll, replies, reply, _i, _len, _ref, _ref2;
@ -1649,9 +1646,9 @@
while ((reply = replies.pop()) && (reply.id > id)) { while ((reply = replies.pop()) && (reply.id > id)) {
arr.push(reply.parentNode.parentNode.parentNode); arr.push(reply.parentNode.parentNode.parentNode);
} }
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; updater.timer.textContent = '-' + conf['Interval'];
if (updater.verbose) { if (conf['Verbose']) {
updater.count.textContent = '+' + arr.length; updater.count.textContent = '+' + arr.length;
if (arr.length === 0) { if (arr.length === 0) {
updater.count.className = ''; updater.count.className = '';
@ -2134,7 +2131,6 @@
}; };
quotePreview = { quotePreview = {
init: function() { init: function() {
quotePreview.hl = conf['Quote Highlighting'];
return g.callbacks.push(function(root) { return g.callbacks.push(function(root) {
var quote, _i, _len, _ref, _results; var quote, _i, _len, _ref, _results;
_ref = $$('a.quotelink, a.backlink', root); _ref = $$('a.quotelink, a.backlink', root);
@ -2161,7 +2157,7 @@
id = this.hash.slice(1); id = this.hash.slice(1);
if (el = d.getElementById(id)) { if (el = d.getElementById(id)) {
qp.innerHTML = el.innerHTML; qp.innerHTML = el.innerHTML;
if (quotePreview.hl) { if (conf['Quote Highlighting']) {
$.addClass(el, 'qphl'); $.addClass(el, 'qphl');
} }
if (/backlink/.test(this.className)) { if (/backlink/.test(this.className)) {

29
script.coffee
View File

@ -1268,21 +1268,17 @@ threadHiding =
updater = updater =
init: -> init: ->
updater.interval = conf['Interval'] html = "<div class=move><span id=count></span> <span id=timer>-#{conf['Interval']}</span></div>"
updater.ircUpd = conf['IRC Updating'] {checkbox} = config.updater
updater.verbose = conf['Verbose'] for name of checkbox
title = checkbox[name][1]
html = "<div class=move><span id=count></span> <span id=timer>-#{updater.interval}</span></div>" checked = if checkbox[name] then 'checked' else ''
conf = config.updater.checkbox
for name of conf
title = conf[name][1]
checked = if conf[name] then 'checked' else ''
html += "<div><label title='#{title}'>#{name}<input name='#{name}' type=checkbox #{checked}></label></div>" html += "<div><label title='#{title}'>#{name}<input name='#{name}' type=checkbox #{checked}></label></div>"
checked = if conf['Auto Update'] then 'checked' else '' checked = if conf['Auto Update'] then 'checked' else ''
html += " html += "
<div><label title='Controls whether *this* thread auotmatically updates or not'>Auto Update This<input name='Auto Update This' type=checkbox #{checked}></label></div> <div><label title='Controls whether *this* thread auotmatically updates or not'>Auto Update This<input name='Auto Update This' type=checkbox #{checked}></label></div>
<div><label>Interval (s)<input name=Interval value=#{updater.interval} type=text></label></div> <div><label>Interval (s)<input name=Interval value=#{conf['Interval']} type=text></label></div>
<div><input value='Update Now' type=button></div>" <div><input value='Update Now' type=button></div>"
dialog = ui.dialog 'updater', bottom: '0', right: '0', html dialog = ui.dialog 'updater', bottom: '0', right: '0', html
@ -1310,7 +1306,7 @@ updater =
cb: cb:
verbose: -> verbose: ->
if updater.verbose = @checked if conf['Verbose'] = @checked
updater.count.textContent = '+0' updater.count.textContent = '+0'
$.show updater.timer $.show updater.timer
else else
@ -1324,7 +1320,7 @@ updater =
else else
window.clearInterval updater.intervalID window.clearInterval updater.intervalID
interval: -> interval: ->
updater.interval = @value = @value.match(/\d+/)[0] conf['Interval'] = @value = parseInt(@value) or conf['Interval']
update: -> update: ->
if @status is 404 if @status is 404
updater.timer.textContent = '' updater.timer.textContent = ''
@ -1348,10 +1344,10 @@ updater =
replies = $$ 'td[id]', body replies = $$ 'td[id]', body
while (reply = replies.pop()) and (reply.id > id) while (reply = replies.pop()) and (reply.id > id)
arr.push reply.parentNode.parentNode.parentNode #table 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 updater.timer.textContent = '-' + conf['Interval']
if updater.verbose if conf['Verbose']
updater.count.textContent = '+' + arr.length updater.count.textContent = '+' + arr.length
if arr.length is 0 if arr.length is 0
updater.count.className = '' updater.count.className = ''
@ -1665,7 +1661,6 @@ quoteInline =
quotePreview = quotePreview =
init: -> init: ->
quotePreview.hl = conf['Quote Highlighting']
g.callbacks.push (root) -> g.callbacks.push (root) ->
for quote in $$ 'a.quotelink, a.backlink', root for quote in $$ 'a.quotelink, a.backlink', root
continue unless quote.hash continue unless quote.hash
@ -1681,7 +1676,7 @@ quotePreview =
id = @hash[1..] id = @hash[1..]
if el = d.getElementById id if el = d.getElementById id
qp.innerHTML = el.innerHTML qp.innerHTML = el.innerHTML
$.addClass el, 'qphl' if quotePreview.hl $.addClass el, 'qphl' if conf['Quote Highlighting']
if /backlink/.test @className if /backlink/.test @className
replyID = $.x('ancestor::*[@id][1]', @).id.match(/\d+/)[0] replyID = $.x('ancestor::*[@id][1]', @).id.match(/\d+/)[0]
for quote in $$ 'a.quotelink', qp for quote in $$ 'a.quotelink', qp