Merge pull request #122 from guybedford/loader-rename

guybedford · guybedford · commit 7fa7e54f72ca · 2014-04-08T14:30:59.000-07:00
Loader rename
diff --git a/dist/es6-module-loader-sans-promises.js b/dist/es6-module-loader-sans-promises.js
@@ -706,7 +706,8 @@ function logloads(loads) {
     if (typeof exports === 'object')
       module.exports = Loader;
 
-    global.Loader || (global.Loader = Loader);
+    global.Reflect = global.Reflect || {};
+    global.Reflect.Loader = global.Reflect.Loader || Loader;
     global.LoaderPolyfill = Loader;
     global.Module = Module;
 
@@ -741,7 +742,7 @@ function logloads(loads) {
 
 (function (global) {
   var isBrowser = typeof window != 'undefined';
-  var Loader = global.Loader || require('./loader');
+  var Loader = global.Reflect && global.Reflect.Loader || require('./loader');
   var Promise = global.Promise || require('./promise');
 
   // Helpers
diff --git a/dist/es6-module-loader-sans-promises.min.js b/dist/es6-module-loader-sans-promises.min.js
diff --git a/dist/es6-module-loader.js b/dist/es6-module-loader.js
@@ -1622,7 +1622,8 @@ function logloads(loads) {
     if (typeof exports === 'object')
       module.exports = Loader;
 
-    global.Loader || (global.Loader = Loader);
+    global.Reflect = global.Reflect || {};
+    global.Reflect.Loader = global.Reflect.Loader || Loader;
     global.LoaderPolyfill = Loader;
     global.Module = Module;
 
@@ -1657,7 +1658,7 @@ function logloads(loads) {
 
 (function (global) {
   var isBrowser = typeof window != 'undefined';
-  var Loader = global.Loader || require('./loader');
+  var Loader = global.Reflect && global.Reflect.Loader || require('./loader');
   var Promise = global.Promise || require('./promise');
 
   // Helpers
diff --git a/dist/es6-module-loader.min.js b/dist/es6-module-loader.min.js
diff --git a/lib/loader.js b/lib/loader.js
@@ -706,7 +706,8 @@ function logloads(loads) {
     if (typeof exports === 'object')
       module.exports = Loader;
 
-    global.Loader || (global.Loader = Loader);
+    global.Reflect = global.Reflect || {};
+    global.Reflect.Loader = global.Reflect.Loader || Loader;
     global.LoaderPolyfill = Loader;
     global.Module = Module;
 
diff --git a/lib/system.js b/lib/system.js
@@ -12,7 +12,7 @@
 
 (function (global) {
   var isBrowser = typeof window != 'undefined';
-  var Loader = global.Loader || require('./loader');
+  var Loader = global.Reflect && global.Reflect.Loader || require('./loader');
   var Promise = global.Promise || require('./promise');
 
   // Helpers
diff --git a/test/test.js b/test/test.js
@@ -365,7 +365,7 @@ function runTests() {
     });
   });
 
-  var customLoader = new Loader({
+  var customLoader = new Reflect.Loader({
     normalize: function(name, parentName, parentAddress) {
       return new Promise(function(resolve, reject) {
         if (name == 'asdfasdf') {
