From 29d7701ee2b87fc90f9b5bbb8b004143985dc6ea Mon Sep 17 00:00:00 2001 From: James Reed Date: Wed, 17 May 2017 11:52:03 +0100 Subject: [PATCH 1/6] 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..eb56ec86db342 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 1c8940230d36be349fe88e9a103f734d43c6b5bc Mon Sep 17 00:00:00 2001 From: James Reed Date: Wed, 17 May 2017 13:15:40 +0100 Subject: [PATCH 2/6] Slight change of code style for mixins fix --- lib/web/mage/requirejs/mixins.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/web/mage/requirejs/mixins.js b/lib/web/mage/requirejs/mixins.js index eb56ec86db342..4b1db09ccff12 100644 --- a/lib/web/mage/requirejs/mixins.js +++ b/lib/web/mage/requirejs/mixins.js @@ -115,12 +115,14 @@ define('mixins', [ */ getMixins: function (path) { - // fix for when urlArgs is set - if (path.indexOf('?')!=-1) { - path=path.substring(0,path.indexOf('?')); + var config; + + // fix for when urlArgs is set + if (path.indexOf('?') !== -1) { + path = path.substring(0, path.indexOf('?')); } - var config = module.config() || {}, + config = module.config() || {}, mixins = config[path] || {}; return Object.keys(mixins).filter(function (mixin) { From f6d4e84482c89fdf0f3010a05b638d02047fc177 Mon Sep 17 00:00:00 2001 From: James Reed Date: Wed, 17 May 2017 13:50:58 +0100 Subject: [PATCH 3/6] Remove of whitespace from code for mixins fix --- lib/web/mage/requirejs/mixins.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/web/mage/requirejs/mixins.js b/lib/web/mage/requirejs/mixins.js index 4b1db09ccff12..737cd97294015 100644 --- a/lib/web/mage/requirejs/mixins.js +++ b/lib/web/mage/requirejs/mixins.js @@ -114,14 +114,13 @@ define('mixins', [ * @returns {Array} An array of paths to mixins. */ getMixins: function (path) { - var config; - - // fix for when urlArgs is set + + // fix for when urlArgs is set if (path.indexOf('?') !== -1) { path = path.substring(0, path.indexOf('?')); - } - + } + config = module.config() || {}, mixins = config[path] || {}; From fbce271c1d99a49d77f1b9298c208ca3222e7ac5 Mon Sep 17 00:00:00 2001 From: James Reed Date: Wed, 17 May 2017 14:23:56 +0100 Subject: [PATCH 4/6] Change to variable declaration for mixins fix --- lib/web/mage/requirejs/mixins.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/web/mage/requirejs/mixins.js b/lib/web/mage/requirejs/mixins.js index 737cd97294015..ba5c79b75e125 100644 --- a/lib/web/mage/requirejs/mixins.js +++ b/lib/web/mage/requirejs/mixins.js @@ -114,15 +114,14 @@ define('mixins', [ * @returns {Array} An array of paths to mixins. */ getMixins: function (path) { - var config; + var config = module.config() || {}, mixins; // fix for when urlArgs is set if (path.indexOf('?') !== -1) { path = path.substring(0, path.indexOf('?')); } - - config = module.config() || {}, - mixins = config[path] || {}; + + mixins = config[path] || {}; return Object.keys(mixins).filter(function (mixin) { return mixins[mixin] !== false; From 47539919042ec38d906ae3d6a5ec3aabc05cd785 Mon Sep 17 00:00:00 2001 From: James Reed Date: Wed, 17 May 2017 15:29:40 +0100 Subject: [PATCH 5/6] Trailing whitespace removal for mixins fix --- lib/web/mage/requirejs/mixins.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/web/mage/requirejs/mixins.js b/lib/web/mage/requirejs/mixins.js index ba5c79b75e125..23350c61b18c5 100644 --- a/lib/web/mage/requirejs/mixins.js +++ b/lib/web/mage/requirejs/mixins.js @@ -114,13 +114,13 @@ define('mixins', [ * @returns {Array} An array of paths to mixins. */ getMixins: function (path) { - var config = module.config() || {}, mixins; + var config = module.config() || {}, + mixins; // fix for when urlArgs is set if (path.indexOf('?') !== -1) { path = path.substring(0, path.indexOf('?')); - } - + } mixins = config[path] || {}; return Object.keys(mixins).filter(function (mixin) { From 1291747625a112258dae8ed69ab444220194885f Mon Sep 17 00:00:00 2001 From: James Reed Date: Wed, 17 May 2017 16:02:20 +0100 Subject: [PATCH 6/6] More trailing whitespace removal for mixins fix --- 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 23350c61b18c5..77d98e0f81394 100644 --- a/lib/web/mage/requirejs/mixins.js +++ b/lib/web/mage/requirejs/mixins.js @@ -120,7 +120,7 @@ define('mixins', [ // fix for when urlArgs is set if (path.indexOf('?') !== -1) { path = path.substring(0, path.indexOf('?')); - } + } mixins = config[path] || {}; return Object.keys(mixins).filter(function (mixin) {