diff --git a/builds/4chan-X.js b/builds/4chan-X.js index 4645cc21a..c9fe1f3f0 100644 --- a/builds/4chan-X.js +++ b/builds/4chan-X.js @@ -471,7 +471,7 @@ reqs = {}; return function(url, cb) { - var req, rm; + var err, req, rm; if (req = reqs[url]) { if (req.readyState === 4) { @@ -484,21 +484,26 @@ rm = function() { return delete reqs[url]; }; - req = $.ajax(url, { - onload: function(e) { - var _i, _len, _ref; + try { + req = $.ajax(url, { + onload: function(e) { + var _i, _len, _ref; - _ref = this.callbacks; - for (_i = 0, _len = _ref.length; _i < _len; _i++) { - cb = _ref[_i]; - cb.call(this, e); - } - this.evt = e; - return delete this.callbacks; - }, - onabort: rm, - onerror: rm - }); + _ref = this.callbacks; + for (_i = 0, _len = _ref.length; _i < _len; _i++) { + cb = _ref[_i]; + cb.call(this, e); + } + this.evt = e; + return delete this.callbacks; + }, + onabort: rm, + onerror: rm + }); + } catch (_error) { + err = _error; + return; + } req.callbacks = [cb]; return reqs[url] = req; }; diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 5589f6149..b02edcdc6 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -468,7 +468,7 @@ reqs = {}; return function(url, cb) { - var req, rm; + var err, req, rm; if (req = reqs[url]) { if (req.readyState === 4) { @@ -481,21 +481,26 @@ rm = function() { return delete reqs[url]; }; - req = $.ajax(url, { - onload: function(e) { - var _i, _len, _ref; + try { + req = $.ajax(url, { + onload: function(e) { + var _i, _len, _ref; - _ref = this.callbacks; - for (_i = 0, _len = _ref.length; _i < _len; _i++) { - cb = _ref[_i]; - cb.call(this, e); - } - this.evt = e; - return delete this.callbacks; - }, - onabort: rm, - onerror: rm - }); + _ref = this.callbacks; + for (_i = 0, _len = _ref.length; _i < _len; _i++) { + cb = _ref[_i]; + cb.call(this, e); + } + this.evt = e; + return delete this.callbacks; + }, + onabort: rm, + onerror: rm + }); + } catch (_error) { + err = _error; + return; + } req.callbacks = [cb]; return reqs[url] = req; }; diff --git a/builds/crx/script.js b/builds/crx/script.js index 5b92552b3..37e6a0d82 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -449,7 +449,7 @@ reqs = {}; return function(url, cb) { - var req, rm; + var err, req, rm; if (req = reqs[url]) { if (req.readyState === 4) { @@ -462,21 +462,26 @@ rm = function() { return delete reqs[url]; }; - req = $.ajax(url, { - onload: function(e) { - var _i, _len, _ref; + try { + req = $.ajax(url, { + onload: function(e) { + var _i, _len, _ref; - _ref = this.callbacks; - for (_i = 0, _len = _ref.length; _i < _len; _i++) { - cb = _ref[_i]; - cb.call(this, e); - } - this.evt = e; - return delete this.callbacks; - }, - onabort: rm, - onerror: rm - }); + _ref = this.callbacks; + for (_i = 0, _len = _ref.length; _i < _len; _i++) { + cb = _ref[_i]; + cb.call(this, e); + } + this.evt = e; + return delete this.callbacks; + }, + onabort: rm, + onerror: rm + }); + } catch (_error) { + err = _error; + return; + } req.callbacks = [cb]; return reqs[url] = req; }; diff --git a/src/General/lib/$.coffee b/src/General/lib/$.coffee index ab438113c..ce7f84737 100644 --- a/src/General/lib/$.coffee +++ b/src/General/lib/$.coffee @@ -102,13 +102,16 @@ $.cache = do -> req.callbacks.push cb return rm = -> delete reqs[url] - req = $.ajax url, - onload: (e) -> - cb.call @, e for cb in @callbacks - @evt = e - delete @callbacks - onabort: rm - onerror: rm + try + req = $.ajax url, + onload: (e) -> + cb.call @, e for cb in @callbacks + @evt = e + delete @callbacks + onabort: rm + onerror: rm + catch err + return req.callbacks = [cb] reqs[url] = req