Skip to content

Commit

Permalink
2.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
vicb committed Jun 8, 2015
1 parent f6f8420 commit 0003ca2
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 14 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "es6-promise",
"namespace": "Promise",
"version": "2.2.0",
"version": "2.3.0",
"description": "A polyfill for ES6-style Promises, tracking rsvp",
"authors": [
"Stefan Penner <[email protected]>"
Expand Down
24 changes: 14 additions & 10 deletions dist/es6-promise.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @copyright Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors (Conversion to ES6 API by Jake Archibald)
* @license Licensed under MIT license
* See https://raw.githubusercontent.com/jakearchibald/es6-promise/master/LICENSE
* @version 2.2.0
* @version 2.3.0
*/

(function() {
Expand Down Expand Up @@ -35,7 +35,7 @@
var lib$es6$promise$asap$$vertxNext;
var lib$es6$promise$asap$$customSchedulerFn;

function lib$es6$promise$asap$$asap(callback, arg) {
var lib$es6$promise$asap$$asap = function asap(callback, arg) {
lib$es6$promise$asap$$queue[lib$es6$promise$asap$$len] = callback;
lib$es6$promise$asap$$queue[lib$es6$promise$asap$$len + 1] = arg;
lib$es6$promise$asap$$len += 2;
Expand All @@ -51,11 +51,14 @@
}
}

var lib$es6$promise$asap$$default = lib$es6$promise$asap$$asap;
function lib$es6$promise$asap$$setScheduler(scheduleFn) {
lib$es6$promise$asap$$customSchedulerFn = scheduleFn;
}

function lib$es6$promise$asap$$setAsap(asapFn) {
lib$es6$promise$asap$$asap = asapFn;
}

var lib$es6$promise$asap$$browserWindow = (typeof window !== 'undefined') ? window : undefined;
var lib$es6$promise$asap$$browserGlobal = lib$es6$promise$asap$$browserWindow || {};
var lib$es6$promise$asap$$BrowserMutationObserver = lib$es6$promise$asap$$browserGlobal.MutationObserver || lib$es6$promise$asap$$browserGlobal.WebKitMutationObserver;
Expand Down Expand Up @@ -187,7 +190,7 @@
}

function lib$es6$promise$$internal$$handleForeignThenable(promise, thenable, then) {
lib$es6$promise$asap$$default(function(promise) {
lib$es6$promise$asap$$asap(function(promise) {
var sealed = false;
var error = lib$es6$promise$$internal$$tryThen(then, thenable, function(value) {
if (sealed) { return; }
Expand Down Expand Up @@ -268,7 +271,7 @@
promise._state = lib$es6$promise$$internal$$FULFILLED;

if (promise._subscribers.length !== 0) {
lib$es6$promise$asap$$default(lib$es6$promise$$internal$$publish, promise);
lib$es6$promise$asap$$asap(lib$es6$promise$$internal$$publish, promise);
}
}

Expand All @@ -277,7 +280,7 @@
promise._state = lib$es6$promise$$internal$$REJECTED;
promise._result = reason;

lib$es6$promise$asap$$default(lib$es6$promise$$internal$$publishRejection, promise);
lib$es6$promise$asap$$asap(lib$es6$promise$$internal$$publishRejection, promise);
}

function lib$es6$promise$$internal$$subscribe(parent, child, onFulfillment, onRejection) {
Expand All @@ -291,7 +294,7 @@
subscribers[length + lib$es6$promise$$internal$$REJECTED] = onRejection;

if (length === 0 && parent._state) {
lib$es6$promise$asap$$default(lib$es6$promise$$internal$$publish, parent);
lib$es6$promise$asap$$asap(lib$es6$promise$$internal$$publish, parent);
}
}

Expand Down Expand Up @@ -548,7 +551,7 @@
/**
Promise objects represent the eventual result of an asynchronous operation. The
primary way of interacting with a promise is through its `then` method, which
registers callbacks to receive either a promises eventual value or the reason
registers callbacks to receive either a promise's eventual value or the reason
why the promise cannot be fulfilled.
Terminology
Expand Down Expand Up @@ -672,7 +675,8 @@
lib$es6$promise$promise$$Promise.resolve = lib$es6$promise$promise$resolve$$default;
lib$es6$promise$promise$$Promise.reject = lib$es6$promise$promise$reject$$default;
lib$es6$promise$promise$$Promise._setScheduler = lib$es6$promise$asap$$setScheduler;
lib$es6$promise$promise$$Promise._asap = lib$es6$promise$asap$$default;
lib$es6$promise$promise$$Promise._setAsap = lib$es6$promise$asap$$setAsap;
lib$es6$promise$promise$$Promise._asap = lib$es6$promise$asap$$asap;

lib$es6$promise$promise$$Promise.prototype = {
constructor: lib$es6$promise$promise$$Promise,
Expand Down Expand Up @@ -883,7 +887,7 @@

if (state) {
var callback = arguments[state - 1];
lib$es6$promise$asap$$default(function(){
lib$es6$promise$asap$$asap(function(){
lib$es6$promise$$internal$$invokeCallback(state, child, callback, result);
});
} else {
Expand Down
Loading

0 comments on commit 0003ca2

Please sign in to comment.