From f269690b3e355fdf241c6f6dd25a0fb471be7755 Mon Sep 17 00:00:00 2001 From: Zixaphir Date: Thu, 25 Apr 2013 01:54:39 -0700 Subject: [PATCH] Mite need to rethink a couple of those "4chanXInitFinished" cb()s... --- builds/4chan-X.js | 14 ++++++++------ builds/4chan-X.user.js | 14 ++++++++------ builds/crx/script.js | 14 ++++++++------ src/main.coffee | 9 +++++---- 4 files changed, 29 insertions(+), 22 deletions(-) diff --git a/builds/4chan-X.js b/builds/4chan-X.js index 07a76c696..216c029ab 100644 --- a/builds/4chan-X.js +++ b/builds/4chan-X.js @@ -9658,7 +9658,7 @@ } }, callbackNodesDB: function(klass, nodes, cb) { - var errors, func, i, len, node, queue, softTask, _i; + var errors, func, i, len, node, queue, softTask; queue = []; softTask = function() { @@ -9671,7 +9671,7 @@ func = task[0]; args = Array.prototype.slice.call(task, 1); func.apply(func, args); - return setTimeout(softTask, 20); + return setTimeout(softTask, 0); }; len = nodes.length; i = 0; @@ -9696,15 +9696,17 @@ } } if (i === len) { - cb(); if (errors) { - return Main.handleErrors(errors); + Main.handleErrors(errors); + } + if (cb) { + return cb(); } } }; - for (i = _i = 0; 0 <= len ? _i < len : _i > len; i = 0 <= len ? ++_i : --_i) { + while (i < len) { node = nodes[i]; - queue.push([func, node, i]); + queue.push([func, node, ++i]); } return softTask(); }, diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index c3cfd420f..457047733 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -9681,7 +9681,7 @@ } }, callbackNodesDB: function(klass, nodes, cb) { - var errors, func, i, len, node, queue, softTask, _i; + var errors, func, i, len, node, queue, softTask; queue = []; softTask = function() { @@ -9694,7 +9694,7 @@ func = task[0]; args = Array.prototype.slice.call(task, 1); func.apply(func, args); - return setTimeout(softTask, 20); + return setTimeout(softTask, 0); }; len = nodes.length; i = 0; @@ -9719,15 +9719,17 @@ } } if (i === len) { - cb(); if (errors) { - return Main.handleErrors(errors); + Main.handleErrors(errors); + } + if (cb) { + return cb(); } } }; - for (i = _i = 0; 0 <= len ? _i < len : _i > len; i = 0 <= len ? ++_i : --_i) { + while (i < len) { node = nodes[i]; - queue.push([func, node, i]); + queue.push([func, node, ++i]); } return softTask(); }, diff --git a/builds/crx/script.js b/builds/crx/script.js index 53fb08b2c..c9e41c2b9 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -9524,7 +9524,7 @@ } }, callbackNodesDB: function(klass, nodes, cb) { - var errors, func, i, len, node, queue, softTask, _i; + var errors, func, i, len, node, queue, softTask; queue = []; softTask = function() { @@ -9537,7 +9537,7 @@ func = task[0]; args = Array.prototype.slice.call(task, 1); func.apply(func, args); - return setTimeout(softTask, 20); + return setTimeout(softTask, 0); }; len = nodes.length; i = 0; @@ -9562,15 +9562,17 @@ } } if (i === len) { - cb(); if (errors) { - return Main.handleErrors(errors); + Main.handleErrors(errors); + } + if (cb) { + return cb(); } } }; - for (i = _i = 0; 0 <= len ? _i < len : _i > len; i = 0 <= len ? ++_i : --_i) { + while (i < len) { node = nodes[i]; - queue.push([func, node, i]); + queue.push([func, node, ++i]); } return softTask(); }, diff --git a/src/main.coffee b/src/main.coffee index 9fb09397d..13cca9348 100644 --- a/src/main.coffee +++ b/src/main.coffee @@ -228,7 +228,7 @@ Main = func = task[0] args = Array::slice.call task, 1 func.apply func, args - setTimeout softTask, 20 + setTimeout softTask, 0 # get the nodes' length only once len = nodes.length @@ -247,12 +247,13 @@ Main = error: err # finish if i is len - cb() Main.handleErrors errors if errors + cb() if cb - for i in [0...len] + while i < len node = nodes[i] - queue.push [func, node, i] + queue.push [func, node, ++i] + softTask() addCallback: (e) ->