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

Merge pull request #322 from MayhemYDG/master

Browse Source 
Quote inlining fixes.
This commit is contained in:
James Campos 2011-10-10 16:02:01 -07:00
commit 7763f76f9a
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
4chan_x.user.js
View File

@ -2394,7 +2394,7 @@
if (this.classList.contains('inlined')) { if (this.classList.contains('inlined')) {
quoteInline.rm(this, id); quoteInline.rm(this, id);
} else { } else {
if ($.x('ancestor::td[@id]', this).id === id) { if ($.x("ancestor::*[@id='" + id + "']", this)) {
return; return;
} }
quoteInline.add(this, id); quoteInline.add(this, id);
@ -2432,8 +2432,10 @@
_ref = $$('input', table); _ref = $$('input', table);
for (_i = 0, _len = _ref.length; _i < _len; _i++) { for (_i = 0, _len = _ref.length; _i < _len; _i++) {
inlined = _ref[_i]; inlined = _ref[_i];
if (!(hidden = $.id(inlined.name)).classList.contains('op')) { if (hidden = $.id(inlined.name)) {
$.x('ancestor::table[1]', hidden).hidden = false; if (!hidden.classList.contains('op')) {
$.x('ancestor::table[1]', hidden).hidden = false;
}
} }
} }
return $.rm(table); return $.rm(table);

7
script.coffee
View File

@ -1789,7 +1789,7 @@ quoteInline =
if @classList.contains 'inlined' if @classList.contains 'inlined'
quoteInline.rm @, id quoteInline.rm @, id
else else
return if $.x('ancestor::td[@id]', @).id is id return if $.x("ancestor::*[@id='#{id}']", @)
quoteInline.add @, id quoteInline.add @, id
@classList.toggle 'inlined' @classList.toggle 'inlined'
@ -1816,8 +1816,9 @@ quoteInline =
#select the corresponding table or loading td #select the corresponding table or loading td
table = $.x "following::*[@id='i#{id}']", q table = $.x "following::*[@id='i#{id}']", q
for inlined in $$ 'input', table for inlined in $$ 'input', table
unless (hidden = $.id inlined.name).classList.contains 'op' if hidden = $.id inlined.name
$.x('ancestor::table[1]', hidden).hidden = false unless hidden.classList.contains 'op'
$.x('ancestor::table[1]', hidden).hidden = false
$.rm table $.rm table
parse: (req, pathname, id, threadID, inline) -> parse: (req, pathname, id, threadID, inline) ->