# HG changeset patch # User nickolay # Date 1559756655 -10800 # Node ID 27e8e9e38e073a3764a6c029008586d856357a08 # Parent 8af8e840dd49f31085a8af1fd9cc3b1f1caecb5d# Parent 1dc2fd263b90691e6ecd750c9a330c915f11f423 Слияние diff -r 1dc2fd263b90 -r 27e8e9e38e07 core/src/js/safe.js --- a/core/src/js/safe.js Wed Jun 27 04:35:04 2018 +0300 +++ b/core/src/js/safe.js Wed Jun 05 20:44:15 2019 +0300 @@ -164,10 +164,10 @@ if (x && x.then) return x; return { - then : function(cb) { + then: function (cb) { try { return cb ? wrapresult(cb(x)) : this; - } catch(e2) { + } catch (e2) { return wrapresult(e2); } } @@ -175,10 +175,12 @@ } } - try { - return wrapresult(fn.apply(thisArg, arguments)); - } catch (e) { - return wrapresult(null, e); + return function () { + try { + return wrapresult(fn.apply(thisArg, arguments)); + } catch (e) { + return wrapresult(null, e); + } }; },