Skip to content

Commit f9ade9a

Browse files
authored
Merge pull request #33107 from mrtuvn/jquery-prepare
Prepare jquery mobile work with new version jquery
2 parents 00dad18 + cb96280 commit f9ade9a

File tree

6 files changed

+4
-877
lines changed

6 files changed

+4
-877
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ var config = {
3333
}
3434
},
3535
deps: [
36-
'jquery/jquery.mobile.custom',
3736
'mage/common',
3837
'mage/dataPost',
3938
'mage/bootstrap'

app/design/adminhtml/Magento/backend/etc/view.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
<item type="file">Lib::mage/requirejs/static.js</item>
5454
<item type="file">Lib::jquery/jquery.min.js</item>
5555
<item type="file">Lib::jquery/jquery.parsequery.js</item>
56-
<item type="file">Lib::jquery/jquery.mobile.custom.js</item>
5756
<item type="file">Lib::jquery/jquery-ui.js</item>
5857
<item type="file">Lib::matchMedia.js</item>
5958
<item type="file">Lib::requirejs/require.js</item>

dev/tests/integration/testsuite/Magento/Framework/View/_files/static/expected/test.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dev/tests/integration/testsuite/Magento/Framework/View/_files/static/theme/web/js/test.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ define([
66
"jquery",
77
"matchMedia",
88
"jquery-ui-modules/menu",
9-
"jquery/jquery.mobile.custom",
109
"mage/translate"
1110
], function ($, mediaCheck) {
1211
'use strict';
@@ -54,8 +53,7 @@ define([
5453

5554
_assignControls: function () {
5655
this.controls = {
57-
toggleBtn: $('[data-action="toggle-nav"]'),
58-
swipeArea: $('.nav-sections')
56+
toggleBtn: $('[data-action="toggle-nav"]')
5957
};
6058

6159
return this;
@@ -66,7 +64,6 @@ define([
6664
var toggle = this.toggle;
6765

6866
this._on(controls.toggleBtn, {'click': toggle});
69-
this._on(controls.swipeArea, {'swipeleft': toggle});
7067
},
7168

7269
toggle: function () {

0 commit comments

Comments
 (0)