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

Merge branch 'v3'

Browse Source
This commit is contained in:
Zixaphir 2014-03-06 21:20:48 -07:00
commit 2aa679360d
4 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
builds/appchan-x.user.js
View File

@ -7650,6 +7650,9 @@
} }
if (Conf['Quote Inlining']) { if (Conf['Quote Inlining']) {
$.on(a, 'click', QuoteInline.toggle); $.on(a, 'click', QuoteInline.toggle);
if (Conf['Quote Hash Navigation']) {
QuoteInline.qiQuote(a, quoter.isHidden);
}
} }
return frag; return frag;
} }
@ -7661,10 +7664,11 @@
return; return;
} }
this.process = Conf['Quote Hash Navigation'] ? function(link, clone) { this.process = Conf['Quote Hash Navigation'] ? function(link, clone) {
if (!clone) { $.on(link, 'click', QuoteInline.toggle);
$.after(link, QuoteInline.qiQuote(link, $.hasClass(link, 'filtered'))); if (clone) {
return;
} }
return $.on(link, 'click', QuoteInline.toggle); return QuoteInline.qiQuote(link, $.hasClass(link, 'filtered'));
} : function(link) { } : function(link) {
return $.on(link, 'click', QuoteInline.toggle); return $.on(link, 'click', QuoteInline.toggle);
}; };
@ -7697,11 +7701,11 @@
if (hidden) { if (hidden) {
name += "filtered"; name += "filtered";
} }
return $.el('a', { return $.after(link, $.el('a', {
className: name, className: name,
textContent: '#', textContent: '#',
href: link.href href: link.href
}); }));
}, },
toggle: function(e) { toggle: function(e) {
var boardID, context, postID, threadID, _ref; var boardID, context, postID, threadID, _ref;

14
builds/crx/script.js
View File

@ -7702,6 +7702,9 @@
} }
if (Conf['Quote Inlining']) { if (Conf['Quote Inlining']) {
$.on(a, 'click', QuoteInline.toggle); $.on(a, 'click', QuoteInline.toggle);
if (Conf['Quote Hash Navigation']) {
QuoteInline.qiQuote(a, quoter.isHidden);
}
} }
return frag; return frag;
} }
@ -7713,10 +7716,11 @@
return; return;
} }
this.process = Conf['Quote Hash Navigation'] ? function(link, clone) { this.process = Conf['Quote Hash Navigation'] ? function(link, clone) {
if (!clone) { $.on(link, 'click', QuoteInline.toggle);
$.after(link, QuoteInline.qiQuote(link, $.hasClass(link, 'filtered'))); if (clone) {
return;
} }
return $.on(link, 'click', QuoteInline.toggle); return QuoteInline.qiQuote(link, $.hasClass(link, 'filtered'));
} : function(link) { } : function(link) {
return $.on(link, 'click', QuoteInline.toggle); return $.on(link, 'click', QuoteInline.toggle);
}; };
@ -7749,11 +7753,11 @@
if (hidden) { if (hidden) {
name += "filtered"; name += "filtered";
} }
return $.el('a', { return $.after(link, $.el('a', {
className: name, className: name,
textContent: '#', textContent: '#',
href: link.href href: link.href
}); }));
}, },
toggle: function(e) { toggle: function(e) {
var boardID, context, postID, threadID, _ref; var boardID, context, postID, threadID, _ref;

2
src/Quotelinks/QuoteBacklink.coffee
View File

@ -70,4 +70,6 @@ QuoteBacklink =
$.on a, 'mouseover', QuotePreview.mouseover $.on a, 'mouseover', QuotePreview.mouseover
if Conf['Quote Inlining'] if Conf['Quote Inlining']
$.on a, 'click', QuoteInline.toggle $.on a, 'click', QuoteInline.toggle
if Conf['Quote Hash Navigation']
QuoteInline.qiQuote a, quoter.isHidden
frag frag

5
src/Quotelinks/QuoteInline.coffee
View File

@ -4,8 +4,9 @@ QuoteInline =
@process = if Conf['Quote Hash Navigation'] @process = if Conf['Quote Hash Navigation']
(link, clone) -> (link, clone) ->
$.after link, QuoteInline.qiQuote link, $.hasClass link, 'filtered' unless clone
$.on link, 'click', QuoteInline.toggle $.on link, 'click', QuoteInline.toggle
return if clone
QuoteInline.qiQuote link, $.hasClass link, 'filtered'
else else
(link) -> (link) ->
@ -28,7 +29,7 @@ QuoteInline =
qiQuote: (link, hidden) -> qiQuote: (link, hidden) ->
name = "hashlink" name = "hashlink"
name += "filtered" if hidden name += "filtered" if hidden
$.el 'a', $.after link, $.el 'a',
className: name className: name
textContent: '#' textContent: '#'
href: link.href href: link.href