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