From 28c6239f1c77305d8c0f4db04b8cb1fa78405bba Mon Sep 17 00:00:00 2001 From: James Reed Date: Wed, 17 May 2017 10:41:59 +0100 Subject: [PATCH 1/3] Update to fix urlArgs problem corrupting the path when set in requirejs --- lib/web/mage/requirejs/mixins.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/web/mage/requirejs/mixins.js b/lib/web/mage/requirejs/mixins.js index 22f4968b25f44..2e436d9354618 100644 --- a/lib/web/mage/requirejs/mixins.js +++ b/lib/web/mage/requirejs/mixins.js @@ -114,6 +114,12 @@ define('mixins', [ * @returns {Array} An array of paths to mixins. */ getMixins: function (path) { + + // fix for when urlArgs is set + if (path.indexOf('?')!=-1) { + path=path.substring(0,path.indexOf('?')); + } + var config = module.config() || {}, mixins = config[path] || {}; From dec68b04e057df674b5b12e985cea4f5ae795142 Mon Sep 17 00:00:00 2001 From: James Reed Date: Wed, 17 May 2017 10:48:20 +0100 Subject: [PATCH 2/3] Update to fix urlArgs problem corrupting the path when set in requirejs --- lib/web/mage/requirejs/mixins.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/web/mage/requirejs/mixins.js b/lib/web/mage/requirejs/mixins.js index 2e436d9354618..1a0f384737efc 100644 --- a/lib/web/mage/requirejs/mixins.js +++ b/lib/web/mage/requirejs/mixins.js @@ -115,10 +115,10 @@ define('mixins', [ */ getMixins: function (path) { - // fix for when urlArgs is set - if (path.indexOf('?')!=-1) { - path=path.substring(0,path.indexOf('?')); - } + // fix for when urlArgs is set + if (path.indexOf('?')!=-1) { + path=path.substring(0,path.indexOf('?')); + } var config = module.config() || {}, mixins = config[path] || {}; From 4045492f4c561e198a5c7928136ddf174331639d Mon Sep 17 00:00:00 2001 From: James Reed Date: Wed, 17 May 2017 10:49:13 +0100 Subject: [PATCH 3/3] Update to fix urlArgs problem corrupting the path when set in requirejs --- lib/web/mage/requirejs/mixins.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/web/mage/requirejs/mixins.js b/lib/web/mage/requirejs/mixins.js index 1a0f384737efc..eb56ec86db342 100644 --- a/lib/web/mage/requirejs/mixins.js +++ b/lib/web/mage/requirejs/mixins.js @@ -117,7 +117,7 @@ define('mixins', [ // fix for when urlArgs is set if (path.indexOf('?')!=-1) { - path=path.substring(0,path.indexOf('?')); + path=path.substring(0,path.indexOf('?')); } var config = module.config() || {},