allow scriptLoad to be set to false to opt-out of auto script loading

systemjs · Oct 17, 2015 · 0dd9946 · 0dd9946
1 parent c2a3ea9
commit 0dd9946
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/lib/amd.js b/lib/amd.js
@@ -11,7 +11,7 @@
 
   hook('fetch', function(fetch) {
     return function(load) {
-      if (load.metadata.format === 'amd' && !load.metadata.authorization)
+      if (load.metadata.format === 'amd' && !load.metadata.authorization && load.metadata.scriptLoad !== false)
         load.metadata.scriptLoad = true;
       if (load.metadata.scriptLoad)
         this.get('@@amd-helpers').createDefine();

diff --git a/lib/global.js b/lib/global.js
@@ -33,7 +33,8 @@ hook('fetch', function(fetch) {
     // can be loaded via a script tag
     if (load.metadata.format == 'global' && !load.metadata.authorization
         && load.metadata.exports && !load.metadata.globals 
-        && (!load.metadata.deps || load.metadata.deps.length == 0))
+        && (!load.metadata.deps || load.metadata.deps.length == 0)
+        && load.metadata.scriptLoad !== false)
       load.metadata.scriptLoad = true;
 
     return fetch.call(this, load);

diff --git a/lib/register.js b/lib/register.js
@@ -472,7 +472,7 @@ function createEntry() {
         return '';
       }
 
-      if (load.metadata.format == 'register' && !load.metadata.authorization)
+      if (load.metadata.format == 'register' && !load.metadata.authorization && load.metadata.scriptLoad !== false)
         load.metadata.scriptLoad = true;
 
       load.metadata.deps = load.metadata.deps || [];