Skip to content

Commit

Permalink
Merge pull request #15 from mroderick/increase-sinon-compatibility
Browse files Browse the repository at this point in the history
Increase compatiblity with faking time in test tools
  • Loading branch information
taylorhakes committed Jan 8, 2016
2 parents 18d7e89 + 719c224 commit 7ddc003
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion Promise.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
(function(root) {
// Store setTimeout reference so promise-polyfill will be unaffected by
// other code modifying setTimeout (like sinon.useFakeTimers())
var setTimeout = setTimeout;

// Use polyfill for setImmediate for performance gains
var asap = (typeof setImmediate === 'function' && setImmediate) ||
Expand Down Expand Up @@ -187,4 +190,4 @@
root.Promise = Promise;
}

})(this);
})(this);

0 comments on commit 7ddc003

Please sign in to comment.