0.16.6

ModuleLoader · Apr 28, 2015 · dff97c6 · dff97c6
1 parent 0210452
commit dff97c6
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 39 deletions.
diff --git a/dist/es6-module-loader-sans-promises.js b/dist/es6-module-loader-sans-promises.js
diff --git a/dist/es6-module-loader-sans-promises.js.map b/dist/es6-module-loader-sans-promises.js.map
diff --git a/dist/es6-module-loader-sans-promises.src.js b/dist/es6-module-loader-sans-promises.src.js
@@ -1055,18 +1055,26 @@ function logloads(loads) {
       // by doing m instanceof Module
       var m = new Module();
 
-      for (var key in obj) {
-        (function (key) {
-          defineProperty(m, key, {
-            configurable: false,
-            enumerable: true,
-            get: function () {
-              return obj[key];
-            }
-          });
-        })(key);
+      var pNames;
+      if (Object.getOwnPropertyNames && obj != null) {
+        pNames = Object.getOwnPropertyNames(obj);
+      }
+      else {
+        pNames = [];
+        for (var key in obj)
+          pNames.push(key);
       }
 
+      for (var i = 0; i < pNames.length; i++) (function(key) {
+        defineProperty(m, key, {
+          configurable: false,
+          enumerable: true,
+          get: function () {
+            return obj[key];
+          }
+        });
+      })(pNames[i]);
+
       if (Object.preventExtensions)
         Object.preventExtensions(m);
 
@@ -1232,8 +1240,7 @@ function logloads(loads) {
 
 
 (function() {
-  var isWorker = typeof self !== 'undefined' && typeof WorkerGlobalScope !== 'undefined' && self instanceof WorkerGlobalScope;
-  var isBrowser = typeof window != 'undefined' && !isWorker;
+  var isBrowser = typeof window != 'undefined' && typeof document != 'undefined';
   var isWindows = typeof process != 'undefined' && !!process.platform.match(/^win/);
   var Promise = __global.Promise || require('when/es6-shim/Promise');
 
@@ -1385,7 +1392,7 @@ function logloads(loads) {
 
     $__Object$defineProperty(SystemLoader.prototype, "global", {
       get: function() {
-        return isBrowser ? window : (isWorker ? self : __global);
+        return __global;
       },
 
       enumerable: false
@@ -1530,7 +1537,7 @@ function logloads(loads) {
 
   // <script type="module"> support
   // allow a data-init function callback once loaded
-  if (isBrowser && typeof document.getElementsByTagName != 'undefined') {
+  if (isBrowser && document.getElementsByTagName) {
     var curScript = document.getElementsByTagName('script');
     curScript = curScript[curScript.length - 1];
 
@@ -1583,5 +1590,4 @@ function __eval(__source, __global, __load) {
   }
 }
 
-})(typeof window != 'undefined' ? window : (typeof WorkerGlobalScope != 'undefined' ?
-                                           self : global));
+})(typeof window != 'undefined' ? window : (typeof global != 'undefined' ? global : self));
diff --git a/dist/es6-module-loader.js b/dist/es6-module-loader.js
diff --git a/dist/es6-module-loader.js.map b/dist/es6-module-loader.js.map
diff --git a/dist/es6-module-loader.src.js b/dist/es6-module-loader.src.js
@@ -2325,18 +2325,26 @@ function logloads(loads) {
       // by doing m instanceof Module
       var m = new Module();
 
-      for (var key in obj) {
-        (function (key) {
-          defineProperty(m, key, {
-            configurable: false,
-            enumerable: true,
-            get: function () {
-              return obj[key];
-            }
-          });
-        })(key);
+      var pNames;
+      if (Object.getOwnPropertyNames && obj != null) {
+        pNames = Object.getOwnPropertyNames(obj);
+      }
+      else {
+        pNames = [];
+        for (var key in obj)
+          pNames.push(key);
       }
 
+      for (var i = 0; i < pNames.length; i++) (function(key) {
+        defineProperty(m, key, {
+          configurable: false,
+          enumerable: true,
+          get: function () {
+            return obj[key];
+          }
+        });
+      })(pNames[i]);
+
       if (Object.preventExtensions)
         Object.preventExtensions(m);
 
@@ -2502,8 +2510,7 @@ function logloads(loads) {
 
 
 (function() {
-  var isWorker = typeof self !== 'undefined' && typeof WorkerGlobalScope !== 'undefined' && self instanceof WorkerGlobalScope;
-  var isBrowser = typeof window != 'undefined' && !isWorker;
+  var isBrowser = typeof window != 'undefined' && typeof document != 'undefined';
   var isWindows = typeof process != 'undefined' && !!process.platform.match(/^win/);
   var Promise = __global.Promise || require('when/es6-shim/Promise');
 
@@ -2655,7 +2662,7 @@ function logloads(loads) {
 
     $__Object$defineProperty(SystemLoader.prototype, "global", {
       get: function() {
-        return isBrowser ? window : (isWorker ? self : __global);
+        return __global;
       },
 
       enumerable: false
@@ -2800,7 +2807,7 @@ function logloads(loads) {
 
   // <script type="module"> support
   // allow a data-init function callback once loaded
-  if (isBrowser && typeof document.getElementsByTagName != 'undefined') {
+  if (isBrowser && document.getElementsByTagName) {
     var curScript = document.getElementsByTagName('script');
     curScript = curScript[curScript.length - 1];
 
@@ -2853,5 +2860,4 @@ function __eval(__source, __global, __load) {
   }
 }
 
-})(typeof window != 'undefined' ? window : (typeof WorkerGlobalScope != 'undefined' ?
-                                           self : global));
+})(typeof window != 'undefined' ? window : (typeof global != 'undefined' ? global : self));
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "es6-module-loader",
   "description": "An ES6 Module Loader shim",
-  "version": "0.16.5",
+  "version": "0.16.6",
   "homepage": "https://github.com/ModuleLoader/es6-module-loader",
   "author": {
     "name": "Guy Bedford, Luke Hoban, Addy Osmani",