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

Merge pull request #312 from MayhemYDG/master

Browse Source 
quoteInline refactor
This commit is contained in:
James Campos 2011-10-04 16:31:38 -07:00
commit b51bc724fc
2 changed files with 59 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
4chan_x.user.js
View File

@ -1958,7 +1958,7 @@
}
} else if (input.name === 'Interval') {
$.bind(input, 'change', function() {
return conf['Interval'] = this.value = parseInt(this.value) || conf['Interval'];
return conf['Interval'] = this.value = parseInt(this.value, 10) || conf['Interval'];
});
$.bind(input, 'change', $.cb.value);
} else if (input.type === 'button') {
@ -2428,36 +2428,33 @@
});
},
toggle: function(e) {
var el, hidden, id, inline, inlined, root, table, threadID, _i, _len, _ref;
var id;
if (e.shiftKey || e.altKey || e.ctrlKey || e.button !== 0) {
return;
}
e.preventDefault();
id = this.hash.slice(1);
if (table = $("#i" + id, $.x('ancestor::td[1]', this))) {
$.rm(table);
$.removeClass(this, 'inlined');
_ref = $$('input', table);
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
inlined = _ref[_i];
if (hidden = $.id(inlined.name)) {
$.x('ancestor::table[1]', hidden).hidden = false;
}
if (this.classList.contains('inlined')) {
quoteInline.rm(this, id);
} else {
if ($.x('ancestor::td[@id]', this).id === id) {
return;
}
return;
quoteInline.add(this, id);
}
root = this.parentNode.nodeName === 'FONT' ? this.parentNode : this.nextSibling ? this.nextSibling : this;
return this.classList.toggle('inlined');
},
add: function(q, id) {
var el, inline, root, threadID;
root = q.parentNode.nodeName === 'FONT' ? q.parentNode : q.nextSibling ? q.nextSibling : q;
if (el = $.id(id)) {
inline = quoteInline.table(id, el.innerHTML);
if (this.className === 'backlink') {
if ($("a.backlink[href='#" + id + "']", el)) {
return;
}
$.after(this.parentNode, inline);
$.x('ancestor::table[1]', el).hidden = true;
} else {
$.after(root, inline);
if (q.className === 'backlink') {
$.after(q.parentNode, inline);
$.x('ancestor::table', el).hidden = true;
return;
}
return $.after(root, inline);
} else {
inline = $.el('td', {
className: 'reply inline',
@ -2465,13 +2462,24 @@
innerHTML: "Loading " + id + "..."
});
$.after(root, inline);
pathname = this.pathname;
pathname = q.pathname;
threadID = pathname.split('/').pop();
$.cache(pathname, (function() {
return $.cache(pathname, (function() {
return quoteInline.parse(this, pathname, id, threadID, inline);
}));
}
return $.addClass(this, 'inlined');
},
rm: function(q, id) {
var hidden, inlined, table, _i, _len, _ref;
table = $.x("following::*[@id='i" + id + "']", q);
_ref = $$('input', table);
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
inlined = _ref[_i];
if (hidden = $.id(inlined.name)) {
$.x('ancestor::table[1]', hidden).hidden = false;
}
}
return $.rm(table);
},
parse: function(req, pathname, id, threadID, inline) {
var body, href, html, link, newInline, op, quote, reply, _i, _j, _len, _len2, _ref, _ref2;
@ -2486,7 +2494,7 @@
innerHTML: req.responseText
});
if (id === threadID) {
op = threading.op($('form[name=delform] > *', body));
op = threading.op($('body > form', body).firstChild);
html = op.innerHTML;
} else {
_ref = $$('td.reply', body);

45
script.coffee
View File

@ -1466,7 +1466,7 @@ updater =
$.bind input, 'click', updater.cb.autoUpdate
updater.cb.autoUpdate.call input
else if input.name is 'Interval'
$.bind input, 'change', -> conf['Interval'] = @value = parseInt(@value) or conf['Interval']
$.bind input, 'change', -> conf['Interval'] = @value = parseInt(@value, 10) or conf['Interval']
$.bind input, 'change', $.cb.value
else if input.type is 'button'
$.bind input, 'click', updater.updateNow
@ -1792,35 +1792,42 @@ quoteInline =
$.bind quote, 'click', quoteInline.toggle
toggle: (e) ->
return if e.shiftKey or e.altKey or e.ctrlKey or e.button isnt 0
e.preventDefault()
id = @hash[1..]
if table = $ "#i#{id}", $.x 'ancestor::td[1]', @
$.rm table
$.removeClass @, 'inlined'
for inlined in $$ 'input', table
if hidden = $.id inlined.name
$.x('ancestor::table[1]', hidden).hidden = false
return
root = if @parentNode.nodeName is 'FONT' then @parentNode else if @nextSibling then @nextSibling else @
if @classList.contains 'inlined'
quoteInline.rm @, id
else
return if $.x('ancestor::td[@id]', @).id is id
quoteInline.add @, id
@classList.toggle 'inlined'
add: (q, id) ->
root = if q.parentNode.nodeName is 'FONT' then q.parentNode else if q.nextSibling then q.nextSibling else q
if el = $.id id
inline = quoteInline.table id, el.innerHTML
if @className is 'backlink'
return if $("a.backlink[href='##{id}']", el)
$.after @parentNode, inline
$.x('ancestor::table[1]', el).hidden = true
else
$.after root, inline
if q.className is 'backlink'
$.after q.parentNode, inline
$.x('ancestor::table', el).hidden = true
return
$.after root, inline
else
inline = $.el 'td',
className: 'reply inline'
id: "i#{id}"
innerHTML: "Loading #{id}..."
$.after root, inline
{pathname} = @
{pathname} = q
threadID = pathname.split('/').pop()
$.cache pathname, (-> quoteInline.parse @, pathname, id, threadID, inline)
$.addClass @, 'inlined'
rm: (q, id) ->
#select the corresponding table or loading td
table = $.x "following::*[@id='i#{id}']", q
for inlined in $$ 'input', table
if hidden = $.id inlined.name
$.x('ancestor::table[1]', hidden).hidden = false
$.rm table
parse: (req, pathname, id, threadID, inline) ->
return unless inline.parentNode
@ -1831,7 +1838,7 @@ quoteInline =
body = $.el 'body',
innerHTML: req.responseText
if id == threadID #OP
op = threading.op $ 'form[name=delform] > *', body
op = threading.op $('body > form', body).firstChild
html = op.innerHTML
else
for reply in $$ 'td.reply', body