v2.0.0: Removed automatic polypill. Added Promise.immediateFn to allo…

…w changing immediateFn without setImmediate polyfill
taylorhakes · Feb 3, 2015 · 9709964 · 9709964
1 parent 3afb9fb
commit 9709964
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/Promise.js b/Promise.js
@@ -7,14 +7,8 @@
 		root = global;
 	}
 
-	if (typeof module !== 'undefined' && module.exports) {
-		module.exports = root.Promise ? root.Promise : Promise;
-	} else if (!root.Promise) {
-		root.Promise = Promise;
-	}
-
 	// Use polyfill for setImmediate for performance gains
-	var asap = root.setImmediate || function(fn) { setTimeout(fn, 1); };
+	var asap = Promise.immediateFn || root.setImmediate || function(fn) { setTimeout(fn, 1); };
 
 	// Polyfill for Function.prototype.bind
 	function bind(fn, thisArg) {
@@ -183,4 +177,10 @@
 			}
 		});
 	};
+
+	if (typeof module !== 'undefined' && module.exports) {
+		module.exports = Promise;
+	} else if (!root.Promise) {
+		root.Promise = Promise;
+	}
 })();
diff --git a/Promise.min.js b/Promise.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "promise-polyfill",
-  "version": "1.1.6",
+  "version": "2.0.0",
   "description": "Lightweight promise polyfill. A+ compliant",
   "main": "Promise.js",
   "scripts": {