Skip to content

Commit 8d68e2b

Browse files
committed
Merge remote-tracking branch 'origin/2.4-develop' into 2_4_6_Quality_Backlog_v1
2 parents 450bbca + 82ecd9d commit 8d68e2b

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ var config = {
6969
'jquery/validate': 'jquery/jquery.validate',
7070
'jquery/file-uploader': 'jquery/fileUploader/jquery.fileuploader',
7171
'prototype': 'legacy-build.min',
72-
'jquery/jquery.cookie': 'js-cookie/cookie-wrapper',
7372
'jquery/jquery-storageapi': 'js-storage/storage-wrapper',
7473
'text': 'mage/requirejs/text',
7574
'domReady': 'requirejs/domReady',

lib/web/jquery/jquery.cookie.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/**
2+
* Copyright © Magento, Inc. All rights reserved.
3+
* See COPYING.txt for license details.
4+
*/
5+
6+
define([
7+
'jquery',
8+
'js-cookie/cookie-wrapper'
9+
], function () {
10+
11+
});

lib/web/js-storage/js.storage.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
(function (factory) {
1515
var registeredInModuleLoader = false;
1616
if (typeof define === 'function' && define.amd) {
17-
define(['jquery', 'js-cookie/cookie-wrapper'], factory);
17+
define(['jquery', 'jquery/jquery.cookie'], factory);
1818
registeredInModuleLoader = true;
1919
}
2020
if (typeof exports === 'object') {

0 commit comments

Comments
 (0)