Simplified attaching to global object

taylorhakes · Apr 1, 2015 · b086fe6 · b086fe6
1 parent 049ec5c
commit b086fe6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 15 deletions.
diff --git a/Promise.js b/Promise.js
@@ -1,16 +1,8 @@
-(function() {
-    var root;
-
-	if (typeof window === 'object' && window) {
-		root = window;
-	} else if (typeof global === 'object' && global) {
-		root = global;
-	} else {
-		root = {};
-	}
+(function(root) {
 
 	// Use polyfill for setImmediate for performance gains
-	var asap = Promise.immediateFn || root.setImmediate || function(fn) { setTimeout(fn, 1); };
+	var asap = Promise.immediateFn || (typeof setImmediate === 'function' && setImmediate) ||
+		function(fn) { setTimeout(fn, 1); };
 
 	// Polyfill for Function.prototype.bind
 	function bind(fn, thisArg) {
@@ -185,4 +177,5 @@
 	} else if (!root.Promise) {
 		root.Promise = Promise;
 	}
-})();
+
+})(this);
diff --git a/Promise.min.js b/Promise.min.js
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "promise-polyfill",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "homepage": "https://github.com/taylorhakes/promise-polyfill",
   "authors": [
     "Taylor Hakes"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "promise-polyfill",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Lightweight promise polyfill. A+ compliant",
   "main": "Promise.js",
   "scripts": {