Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit 6c46def

Browse files
Remove usage of $.browser as it's unused and deprecated in jQuery. Fixes #14267
1 parent 7deeca2 commit 6c46def

File tree

11 files changed

+6
-31
lines changed

11 files changed

+6
-31
lines changed

app/code/Magento/Checkout/view/frontend/web/js/model/step-navigator.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ define([
144144
*/
145145
navigateTo: function (code, scrollToElementId) {
146146
var sortedItems = steps().sort(this.sortItems),
147-
bodyElem = $.browser.safari || $.browser.chrome ? $('body') : $('html');
147+
bodyElem = $('body');
148148

149149
scrollToElementId = scrollToElementId || null;
150150

app/code/Magento/Checkout/view/frontend/web/js/view/progress-bar.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ define([
88
'underscore',
99
'ko',
1010
'uiComponent',
11-
'Magento_Checkout/js/model/step-navigator',
12-
'jquery/jquery.hashchange'
11+
'Magento_Checkout/js/model/step-navigator'
1312
], function ($, _, ko, Component, stepNavigator) {
1413
'use strict';
1514

@@ -25,7 +24,7 @@ define([
2524
/** @inheritdoc */
2625
initialize: function () {
2726
this._super();
28-
$(window).hashchange(_.bind(stepNavigator.handleHash, stepNavigator));
27+
window.addEventListener('hashchange', _.bind(stepNavigator.handleHash, stepNavigator));
2928
stepNavigator.handleHash();
3029
},
3130

app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
require([
3333
"jquery",
3434
"uiRegistry",
35-
"jquery/jquery.hashchange",
3635
"mage/mage",
3736
"prototype",
3837
"mage/adminhtml/form",
@@ -379,7 +378,7 @@ require([
379378
return false;
380379
};
381380

382-
jQuery(window).hashchange(handleHash);
381+
window.addEventListener('hashchange', handleHash);
383382
handleHash();
384383

385384
registry.set('adminSystemConfig', adminSystemConfig);

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ var config = {
1515
},
1616
'shim': {
1717
'jquery/jquery-migrate': ['jquery'],
18-
'jquery/jquery.hashchange': ['jquery', 'jquery/jquery-migrate'],
1918
'jquery/jstree/jquery.hotkeys': ['jquery'],
2019
'jquery/hover-intent': ['jquery'],
2120
'mage/adminhtml/backup': ['prototype'],
@@ -39,7 +38,6 @@ var config = {
3938
'jquery/validate': 'jquery/jquery.validate',
4039
'jquery/hover-intent': 'jquery/jquery.hoverIntent',
4140
'jquery/file-uploader': 'jquery/fileUploader/jquery.fileupload-fp',
42-
'jquery/jquery.hashchange': 'jquery/jquery.ba-hashchange.min',
4341
'prototype': 'legacy-build.min',
4442
'jquery/jquery-storageapi': 'jquery/jquery.storageapi.min',
4543
'text': 'mage/requirejs/text',

app/code/Magento/User/view/adminhtml/web/app-config.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
require.config({
1010
'waitSeconds': 0,
1111
'shim': {
12-
'jquery/jquery.hashchange': ['jquery'],
1312
'jquery/jstree/jquery.hotkeys': ['jquery'],
1413
'jquery/hover-intent': ['jquery'],
1514
'mage/adminhtml/backup': ['prototype'],
@@ -28,7 +27,6 @@ require.config({
2827
'jquery/validate': 'jquery/jquery.validate',
2928
'jquery/hover-intent': 'jquery/jquery.hoverIntent',
3029
'jquery/file-uploader': 'jquery/fileUploader/jquery.fileupload-fp',
31-
'jquery/jquery.hashchange': 'jquery/jquery.ba-hashchange.min',
3230
'prototype': 'prototype/prototype-amd',
3331
'text': 'requirejs/text',
3432
'domReady': 'requirejs/domReady',

app/design/frontend/Magento/blank/etc/view.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,6 @@
260260
<exclude>
261261
<item type="file">Lib::jquery/jquery.min.js</item>
262262
<item type="file">Lib::jquery/jquery-ui-1.9.2.js</item>
263-
<item type="file">Lib::jquery/jquery.ba-hashchange.min.js</item>
264263
<item type="file">Lib::jquery/jquery.details.js</item>
265264
<item type="file">Lib::jquery/jquery.details.min.js</item>
266265
<item type="file">Lib::jquery/jquery.hoverIntent.js</item>

app/design/frontend/Magento/luma/etc/view.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@
270270
<exclude>
271271
<item type="file">Lib::jquery/jquery.min.js</item>
272272
<item type="file">Lib::jquery/jquery-ui-1.9.2.js</item>
273-
<item type="file">Lib::jquery/jquery.ba-hashchange.min.js</item>
274273
<item type="file">Lib::jquery/jquery.details.js</item>
275274
<item type="file">Lib::jquery/jquery.details.min.js</item>
276275
<item type="file">Lib::jquery/jquery.hoverIntent.js</item>

app/design/frontend/Magento/rush/etc/view.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,6 @@
261261
<exclude>
262262
<item type="file">Lib::jquery/jquery.min.js</item>
263263
<item type="file">Lib::jquery/jquery-ui-1.9.2.js</item>
264-
<item type="file">Lib::jquery/jquery.ba-hashchange.min.js</item>
265264
<item type="file">Lib::jquery/jquery.details.js</item>
266265
<item type="file">Lib::jquery/jquery.details.min.js</item>
267266
<item type="file">Lib::jquery/jquery.hoverIntent.js</item>

dev/tests/integration/testsuite/Magento/Deploy/_files/zoom1/etc/view.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<exclude>
1313
<item type="file">Lib::jquery/jquery.min.js</item>
1414
<item type="file">Lib::jquery/jquery-ui-1.9.2.js</item>
15-
<item type="file">Lib::jquery/jquery.ba-hashchange.min.js</item>
1615
<item type="file">Lib::jquery/jquery.details.js</item>
1716
<item type="file">Lib::jquery/jquery.details.min.js</item>
1817
<item type="file">Lib::jquery/jquery.hoverIntent.js</item>

lib/web/jquery/jquery.ba-hashchange.min.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

lib/web/mage/popup-window.js

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,8 @@ define([
5757
settings.windowURL = settings.windowURL || element.attr('href');
5858

5959
if (settings.centerBrowser) {
60-
if ($.browser.msie) { // Hacked together for IE browsers
61-
centeredY = window.screenTop - 120 +
62-
(((document.documentElement.clientHeight + 120) / 2 - settings.height / 2));
63-
centeredX = window.screenLeft + (((document.body.offsetWidth + 20) / 2 - settings.width / 2));
64-
} else {
65-
centeredY = window.screenY + ((window.outerHeight / 2 - settings.height / 2));
66-
centeredX = window.screenX + ((window.outerWidth / 2 - settings.width / 2));
67-
}
60+
centeredY = window.screenY + ((window.outerHeight / 2 - settings.height / 2));
61+
centeredX = window.screenX + ((window.outerWidth / 2 - settings.width / 2));
6862
windowFeatures += ',left=' + centeredX + ',top=' + centeredY;
6963
} else if (settings.centerScreen) {
7064
centeredY = (screen.height - settings.height) / 2;

0 commit comments

Comments
 (0)