Skip to content

Commit b1dca8c

Browse files
author
Oleksii Korshenko
authored
MAGETWO-69674: Fix for javascript "mixins" when 'urlArgs' is set in requirejs - issue 8221 #9665
2 parents bab4284 + e860254 commit b1dca8c

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

lib/web/mage/requirejs/mixins.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,13 @@ define('mixins', [
115115
*/
116116
getMixins: function (path) {
117117
var config = module.config() || {},
118-
mixins = config[path] || {};
118+
mixins;
119+
120+
// fix for when urlArgs is set
121+
if (path.indexOf('?') !== -1) {
122+
path = path.substring(0, path.indexOf('?'));
123+
}
124+
mixins = config[path] || {};
119125

120126
return Object.keys(mixins).filter(function (mixin) {
121127
return mixins[mixin] !== false;

0 commit comments

Comments
 (0)