From 194d02e09c3bd5abc86bdfc5c9f0176474f0407b Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Thu, 29 Mar 2012 03:03:43 +0200 Subject: [PATCH] Mmmh, what was I thinking? --- 4chan_x.user.js | 16 +++++----------- changelog | 2 +- script.coffee | 11 ++++------- 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 3b0195cb1..cf2375e13 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -3884,7 +3884,7 @@ return $.ready(Main.ready); }, ready: function() { - var MutationObserver, form, nav, node, nodes, observer, _i, _j, _len, _len2, _ref, _ref2; + var MutationObserver, form, nav, observer, _i, _len, _ref; if (d.title === '4chan - 404') { Redirect.init(); return; @@ -3948,13 +3948,7 @@ }); } } - nodes = []; - _ref2 = $$('.op, a + table', form); - for (_j = 0, _len2 = _ref2.length; _j < _len2; _j++) { - node = _ref2[_j]; - nodes.push(Main.preParse(node)); - } - Main.node(nodes, true); + Main.node($$('.op, a + table', form), true); if (MutationObserver = window.WebKitMutationObserver || window.MozMutationObserver || window.OMutationObserver || window.MutationObserver) { observer = new MutationObserver(Main.observer); return observer.observe(form, { @@ -4023,7 +4017,7 @@ try { for (_j = 0, _len2 = nodes.length; _j < _len2; _j++) { node = nodes[_j]; - callback(node); + callback(Main.preParse(node)); } } catch (err) { if (notify) { @@ -4040,7 +4034,7 @@ _ref = mutation.addedNodes; for (_j = 0, _len2 = _ref.length; _j < _len2; _j++) { addedNode = _ref[_j]; - if (addedNode.nodeName === 'TABLE') nodes.push(Main.preParse(addedNode)); + if (addedNode.nodeName === 'TABLE') nodes.push(addedNode); } } if (nodes.length) return Main.node(nodes); @@ -4048,7 +4042,7 @@ listener: function(e) { var target; target = e.target; - if (target.nodeName === 'TABLE') return Main.node([Main.preParse(target)]); + if (target.nodeName === 'TABLE') return Main.node([target]); }, namespace: '4chan_x.', version: '2.29.1', diff --git a/changelog b/changelog index 17f3b3764..603a69fe9 100644 --- a/changelog +++ b/changelog @@ -1,6 +1,6 @@ master - Mayhem - Now works when using https. + Add HTTPS support. Ban support improvements and fixes. 2.29.1 diff --git a/script.coffee b/script.coffee index 323dceaac..825c8e300 100644 --- a/script.coffee +++ b/script.coffee @@ -3328,10 +3328,7 @@ Main = if Conf['Index Navigation'] setTimeout -> Nav.init() - nodes = [] - for node in $$ '.op, a + table', form - nodes.push Main.preParse node - Main.node nodes, true + Main.node $$('.op, a + table', form), true if MutationObserver = window.WebKitMutationObserver or window.MozMutationObserver or window.OMutationObserver or window.MutationObserver observer = new MutationObserver Main.observer @@ -3384,7 +3381,7 @@ Main = node: (nodes, notify) -> for callback in Main.callbacks try - callback node for node in nodes + callback Main.preParse node for node in nodes catch err alert "4chan X (#{Main.version}) error: #{err.message}\nhttp://mayhemydg.github.com/4chan-x/#bug-report\n\n#{err.stack}" if notify return @@ -3392,11 +3389,11 @@ Main = nodes = [] for mutation in mutations for addedNode in mutation.addedNodes - nodes.push Main.preParse addedNode if addedNode.nodeName is 'TABLE' + nodes.push addedNode if addedNode.nodeName is 'TABLE' Main.node nodes if nodes.length listener: (e) -> {target} = e - Main.node [Main.preParse target] if target.nodeName is 'TABLE' + Main.node [target] if target.nodeName is 'TABLE' namespace: '4chan_x.' version: '2.29.1'