From bf39fdfe4ec3ca99b25f30283e4359c23fedddcd Mon Sep 17 00:00:00 2001 From: guybedford Date: Sun, 6 Sep 2015 10:08:27 +0200 Subject: [PATCH] disable script loads when using authorization --- lib/amd.js | 2 +- lib/global.js | 2 +- lib/register.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/amd.js b/lib/amd.js index bc6fa05d..0ebe3579 100644 --- a/lib/amd.js +++ b/lib/amd.js @@ -31,7 +31,7 @@ hook('fetch', function(fetch) { return function(load) { - if (load.metadata.format === 'amd') + if (load.metadata.format === 'amd' && !load.metadata.authorization) load.metadata.scriptLoad = true; if (load.metadata.scriptLoad) this.get('@@amd-helpers').createDefine(this); diff --git a/lib/global.js b/lib/global.js index ca803ffc..f5b0e6fe 100644 --- a/lib/global.js +++ b/lib/global.js @@ -30,7 +30,7 @@ hook('fetch', function(fetch) { // A global with exports, no globals and no deps // can be loaded via a script tag - if (load.metadata.format == 'global' + if (load.metadata.format == 'global' && !load.metadata.authorization && load.metadata.exports && !load.metadata.globals && (!load.metadata.deps || load.metadata.deps.length == 0)) load.metadata.scriptLoad = true; diff --git a/lib/register.js b/lib/register.js index a0a8d63c..2461edc5 100644 --- a/lib/register.js +++ b/lib/register.js @@ -452,7 +452,7 @@ anonRegister = null; calledRegister = false; - if (load.metadata.format == 'register') + if (load.metadata.format == 'register' && !load.metadata.authorization) load.metadata.scriptLoad = true; // NB remove when "deps " is deprecated