mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update q from upstream

Browse source
This commit is contained in:
Simon Kornblith 2012-07-09 21:01:29 -04:00
parent 48a8fa352b
commit 34a2239fa1
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
resource/q.jsm
View file

@ -1340,7 +1340,8 @@ function end(promise) {
// If possible (that is, if in V8), transform the error stack
// trace by removing Node and Q cruft, then concatenating with
// the stack trace of the promise we are ``end``ing. See #57.
if (Error.captureStackTrace && "stack" in error) {
if (Error.captureStackTrace && typeof error === "object" &&
"stack" in error) {
var errorStackFrames = getStackFrames(error);
var promiseStackFrames = getStackFrames(promise);
@ -1367,10 +1368,14 @@ function end(promise) {
exports.timeout = timeout;
function timeout(promise, ms) {
var deferred = defer();
when(promise, deferred.resolve, deferred.reject);
setTimeout(function () {
deferred.reject(new Error("Timed out after " + ms + "ms"));
var timeoutId = setTimeout(function () {
deferred.reject(new Error("Timed out after " + ms + " ms"));
}, ms);
when(promise, function (value) {
clearTimeout(timeoutId);
deferred.resolve(value);
}, deferred.reject);
return deferred.promise;
}