Merge pull request #137 from MayhemYDG/master

I use random anime quotes in my commit descriptions
This commit is contained in:
James Campos 2011-05-25 12:56:10 -07:00
commit 5995ae1f2c
2 changed files with 7 additions and 19 deletions

View File

@ -90,9 +90,9 @@
'Persistent QR': [false, 'Quick reply won\'t disappear after posting. Only in replies.'] 'Persistent QR': [false, 'Quick reply won\'t disappear after posting. Only in replies.']
}, },
quote: { quote: {
'Quote Backlinks': [false, 'Add quote backlinks'], 'Quote Backlinks': [true, 'Add quote backlinks'],
'Quote Inline': [false, 'Show quoted post inline on quote click'], 'Quote Inline': [true, 'Show quoted post inline on quote click'],
'Quote Preview': [false, 'Show quote content on hover'], 'Quote Preview': [true, 'Show quote content on hover'],
'Indicate OP quote': [true, 'Add \'(OP)\' to OP quotes'] 'Indicate OP quote': [true, 'Add \'(OP)\' to OP quotes']
}, },
hide: { hide: {
@ -1229,9 +1229,7 @@
init: function() { init: function() {
var node; var node;
node = $('form[name=delform] > *:not([id])'); node = $('form[name=delform] > *:not([id])');
$.bind(d, 'DOMNodeInserted', threading.stopPropagation); return threading.thread(node);
threading.thread(node);
return $.unbind(d, 'DOMNodeInserted', threading.stopPropagation);
}, },
op: function(node) { op: function(node) {
var op; var op;
@ -1265,9 +1263,6 @@
if (!(node.align || node.nodeName === 'CENTER')) { if (!(node.align || node.nodeName === 'CENTER')) {
return threading.thread(node); return threading.thread(node);
} }
},
stopPropagation: function(e) {
return e.stopPropagation();
} }
}; };
threadHiding = { threadHiding = {

View File

@ -30,9 +30,9 @@ config =
'Quick Reply': [true, 'Reply without leaving the page'] 'Quick Reply': [true, 'Reply without leaving the page']
'Persistent QR': [false, 'Quick reply won\'t disappear after posting. Only in replies.'] 'Persistent QR': [false, 'Quick reply won\'t disappear after posting. Only in replies.']
quote: quote:
'Quote Backlinks': [false, 'Add quote backlinks'] 'Quote Backlinks': [true, 'Add quote backlinks']
'Quote Inline': [false, 'Show quoted post inline on quote click'] 'Quote Inline': [true, 'Show quoted post inline on quote click']
'Quote Preview': [false, 'Show quote content on hover'] 'Quote Preview': [true, 'Show quote content on hover']
'Indicate OP quote': [true, 'Add \'(OP)\' to OP quotes'] 'Indicate OP quote': [true, 'Add \'(OP)\' to OP quotes']
hide: hide:
'Reply Hiding': [true, 'Hide single replies'] 'Reply Hiding': [true, 'Hide single replies']
@ -993,11 +993,7 @@ threading =
init: -> init: ->
# don't thread image controls # don't thread image controls
node = $ 'form[name=delform] > *:not([id])' node = $ 'form[name=delform] > *:not([id])'
# don't confuse other scripts *cough*/b/ackwash*cough*
# gotta have a named function to unbind.
$.bind d, 'DOMNodeInserted', threading.stopPropagation
threading.thread node threading.thread node
$.unbind d, 'DOMNodeInserted', threading.stopPropagation
op: (node) -> op: (node) ->
op = $.el 'div', op = $.el 'div',
@ -1028,9 +1024,6 @@ threading =
unless node.align or node.nodeName is 'CENTER' unless node.align or node.nodeName is 'CENTER'
threading.thread node threading.thread node
stopPropagation: (e) ->
e.stopPropagation()
threadHiding = threadHiding =
init: -> init: ->
hiddenThreads = $.getValue "hiddenThreads/#{g.BOARD}/", {} hiddenThreads = $.getValue "hiddenThreads/#{g.BOARD}/", {}