Skip to content

Commit 9b7f45a

Browse files
committed
MAGETWO-95232: Can not create an invoice using Safari
- Move jQuery no conflict call to ensure it's executed before prototype is loaded
1 parent 8487750 commit 9b7f45a

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

app/code/Magento/Theme/view/base/requirejs-config.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,9 @@ var config = {
6464
}
6565
}
6666
};
67+
68+
require(['jquery'], function ($) {
69+
'use strict';
70+
71+
$.noConflict();
72+
});

lib/web/jquery/patches/jquery.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,12 @@ define([], function () {
2222
return function ($) {
2323
var majorVersion = $.fn.jquery.split('.')[0];
2424

25-
$.noConflict();
26-
2725
if (majorVersion >= 3) {
2826
console.warn('jQuery patch for CVE-2015-9251 is no longer necessary, and should be removed');
2927
}
3028

31-
ajaxResponsePatch(jQuery);
29+
ajaxResponsePatch($);
3230

33-
return jQuery;
31+
return $;
3432
};
3533
});

0 commit comments

Comments
 (0)