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

Fix #887

Browse Source
This commit is contained in:
Nicolas Stepien 2013-01-10 09:49:59 +01:00
parent b6645773f3
commit 325d5920f1
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
4chan_x.user.js
View File

@ -860,7 +860,7 @@
_ref = post.quotes; _ref = post.quotes;
for (_i = 0, _len = _ref.length; _i < _len; _i++) { for (_i = 0, _len = _ref.length; _i < _len; _i++) {
quote = _ref[_i]; quote = _ref[_i];
if (!((el = $.id(quote.hash.slice(1))) && !/catalog$/.test(quote.pathname) && el.hidden)) { if (!((el = $.id(quote.hash.slice(1))) && quote.hostname === 'boards.4chan.org' && !/catalog$/.test(quote.pathname) && el.hidden)) {
continue; continue;
} }
$.addClass(quote, 'filtered'); $.addClass(quote, 'filtered');
@ -4016,7 +4016,7 @@
if (quote.parentNode.parentNode.className === 'capcodeReplies') { if (quote.parentNode.parentNode.className === 'capcodeReplies') {
break; break;
} }
if (!/catalog$/.test(quote.pathname) && (qid = quote.hash.slice(2))) { if (quote.hostname === 'boards.4chan.org' && !/catalog$/.test(quote.pathname) && (qid = quote.hash.slice(2))) {
quotes[qid] = true; quotes[qid] = true;
} }
} }
@ -4057,7 +4057,7 @@
_ref = post.quotes; _ref = post.quotes;
for (_i = 0, _len = _ref.length; _i < _len; _i++) { for (_i = 0, _len = _ref.length; _i < _len; _i++) {
quote = _ref[_i]; quote = _ref[_i];
if (!(quote.hash && !/catalog$/.test(quote.pathname) || /\bdeadlink\b/.test(quote.className))) { if (!(quote.hash && quote.hostname === 'boards.4chan.org' && !/catalog$/.test(quote.pathname) || /\bdeadlink\b/.test(quote.className))) {
continue; continue;
} }
$.on(quote, 'click', QuoteInline.toggle); $.on(quote, 'click', QuoteInline.toggle);
@ -4150,7 +4150,7 @@
_ref = post.quotes; _ref = post.quotes;
for (_i = 0, _len = _ref.length; _i < _len; _i++) { for (_i = 0, _len = _ref.length; _i < _len; _i++) {
quote = _ref[_i]; quote = _ref[_i];
if (!(quote.hash && !/catalog$/.test(quote.pathname) || /\bdeadlink\b/.test(quote.className))) { if (!(quote.hash && quote.hostname === 'boards.4chan.org' && !/catalog$/.test(quote.pathname) || /\bdeadlink\b/.test(quote.className))) {
continue; continue;
} }
$.on(quote, 'mouseover', QuotePreview.mouseover); $.on(quote, 'mouseover', QuotePreview.mouseover);
@ -4290,7 +4290,7 @@
_ref = post.quotes; _ref = post.quotes;
for (_i = 0, _len = _ref.length; _i < _len; _i++) { for (_i = 0, _len = _ref.length; _i < _len; _i++) {
quote = _ref[_i]; quote = _ref[_i];
if (!(quote.hash && !/catalog$/.test(quote.pathname))) { if (!(quote.hash && quote.hostname === 'boards.4chan.org' && !/catalog$/.test(quote.pathname))) {
continue; continue;
} }
path = quote.pathname.split('/'); path = quote.pathname.split('/');

1
changelog
View File

@ -1,6 +1,7 @@
master master
- Mayhem - Mayhem
Fix successful posting causing errors. Fix successful posting causing errors.
Fix 4chan X trying to interact with >>>/board/rules links.
2.37.2 2.37.2
- aeosynth - aeosynth

10
script.coffee
View File

@ -709,7 +709,7 @@ StrikethroughQuotes =
node: (post) -> node: (post) ->
return if post.isInlined return if post.isInlined
for quote in post.quotes for quote in post.quotes
continue unless (el = $.id quote.hash[1..]) and !/catalog$/.test(quote.pathname) and el.hidden continue unless (el = $.id quote.hash[1..]) and quote.hostname is 'boards.4chan.org' and !/catalog$/.test(quote.pathname) and el.hidden
$.addClass quote, 'filtered' $.addClass quote, 'filtered'
if Conf['Recursive Filtering'] and post.ID isnt post.threadID if Conf['Recursive Filtering'] and post.ID isnt post.threadID
show_stub = !!$.x 'preceding-sibling::div[contains(@class,"stub")]', el show_stub = !!$.x 'preceding-sibling::div[contains(@class,"stub")]', el
@ -3321,7 +3321,7 @@ QuoteBacklink =
# Stop at 'Admin/Mod/Dev Replies:' on /q/ # Stop at 'Admin/Mod/Dev Replies:' on /q/
break if quote.parentNode.parentNode.className is 'capcodeReplies' break if quote.parentNode.parentNode.className is 'capcodeReplies'
# Don't process >>>/b/. # Don't process >>>/b/.
if !/catalog$/.test(quote.pathname) and qid = quote.hash[2..] if quote.hostname is 'boards.4chan.org' and !/catalog$/.test(quote.pathname) and qid = quote.hash[2..]
# Duplicate quotes get overwritten. # Duplicate quotes get overwritten.
quotes[qid] = true quotes[qid] = true
a = $.el 'a', a = $.el 'a',
@ -3349,7 +3349,7 @@ QuoteInline =
Main.callbacks.push @node Main.callbacks.push @node
node: (post) -> node: (post) ->
for quote in post.quotes for quote in post.quotes
continue unless quote.hash and !/catalog$/.test(quote.pathname) or /\bdeadlink\b/.test quote.className continue unless quote.hash and quote.hostname is 'boards.4chan.org' and !/catalog$/.test(quote.pathname) or /\bdeadlink\b/.test quote.className
$.on quote, 'click', QuoteInline.toggle $.on quote, 'click', QuoteInline.toggle
for quote in post.backlinks for quote in post.backlinks
$.on quote, 'click', QuoteInline.toggle $.on quote, 'click', QuoteInline.toggle
@ -3418,7 +3418,7 @@ QuotePreview =
Main.callbacks.push @node Main.callbacks.push @node
node: (post) -> node: (post) ->
for quote in post.quotes for quote in post.quotes
continue unless quote.hash and !/catalog$/.test(quote.pathname) or /\bdeadlink\b/.test quote.className continue unless quote.hash and quote.hostname is 'boards.4chan.org' and !/catalog$/.test(quote.pathname) or /\bdeadlink\b/.test quote.className
$.on quote, 'mouseover', QuotePreview.mouseover $.on quote, 'mouseover', QuotePreview.mouseover
for quote in post.backlinks for quote in post.backlinks
$.on quote, 'mouseover', QuotePreview.mouseover $.on quote, 'mouseover', QuotePreview.mouseover
@ -3514,7 +3514,7 @@ QuoteCT =
node: (post) -> node: (post) ->
return if post.isInlined and not post.isCrosspost return if post.isInlined and not post.isCrosspost
for quote in post.quotes for quote in post.quotes
unless quote.hash and !/catalog$/.test quote.pathname unless quote.hash and quote.hostname is 'boards.4chan.org' and !/catalog$/.test quote.pathname
# Make sure this isn't a link to the board we're on. # Make sure this isn't a link to the board we're on.
continue continue
path = quote.pathname.split '/' path = quote.pathname.split '/'