Merge branch 'json' into ajson

This commit is contained in:
Zixaphir 2014-01-11 16:14:29 -07:00
commit f167a2f657
3 changed files with 3 additions and 3 deletions

View File

@ -7024,7 +7024,7 @@
if (Conf['Quote Inlining']) {
$.on(link, 'click', QuoteInline.toggle);
if (Conf['Quote Hash Navigation']) {
nodes.push(QuoteInline.qiQuote(link, $.hasClass(link, 'filtered')));
nodes.push.apply(nodes, QuoteInline.qiQuote(link, $.hasClass(link, 'filtered')));
}
}
$.add(container, nodes);

View File

@ -7028,7 +7028,7 @@
if (Conf['Quote Inlining']) {
$.on(link, 'click', QuoteInline.toggle);
if (Conf['Quote Hash Navigation']) {
nodes.push(QuoteInline.qiQuote(link, $.hasClass(link, 'filtered')));
nodes.push.apply(nodes, QuoteInline.qiQuote(link, $.hasClass(link, 'filtered')));
}
}
$.add(container, nodes);

View File

@ -42,7 +42,7 @@ QuoteBacklink =
$.on link, 'mouseover', QuotePreview.mouseover
if Conf['Quote Inlining']
$.on link, 'click', QuoteInline.toggle
nodes.push QuoteInline.qiQuote link, $.hasClass link, 'filtered' if Conf['Quote Hash Navigation']
nodes.push.apply nodes, QuoteInline.qiQuote link, $.hasClass link, 'filtered' if Conf['Quote Hash Navigation']
$.add container, nodes
return
secondNode: ->