Skip to content

Commit b3aa9ff

Browse files
fascinosumfascinosum
authored
Merge pull request #6975 from magento-commerce/platform-health
[Platform Health] Dependencies update
2 parents ab59159 + 3e1e772 commit b3aa9ff

File tree

55 files changed

+6456
-4732
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+6456
-4732
lines changed

‎app/code/Magento/AdminNotification/view/adminhtml/web/system/notification.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ define([
5252
tmpl = $(tmpl);
5353

5454
this.element.html(
55-
$('<ul />', {
55+
$('<ul></ul>', {
5656
'class': 'message-system-list'
5757
}).append(tmpl)
5858
).trigger('contentUpdated');

‎app/code/Magento/Catalog/view/adminhtml/web/catalog/product-attributes.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ define([
2626
_initModal: function () {
2727
var self = this;
2828

29-
this.modal = $('<div id="create_new_attribute"/>').modal({
29+
this.modal = $('<div id="create_new_attribute"></div>').modal({
3030
title: $.mage.__('New Attribute'),
3131
type: 'slide',
3232
buttons: [],
3333

3434
/** @inheritdoc */
3535
opened: function () {
3636
$(this).parent().addClass('modal-content-new-attribute');
37-
self.iframe = $('<iframe id="create_new_attribute_container">').attr({
37+
self.iframe = $('<iframe id="create_new_attribute_container"></iframe>').attr({
3838
src: self._prepareUrl(),
3939
frameborder: 0
4040
});

‎app/code/Magento/Catalog/view/frontend/web/js/list.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ define([
1818
headings;
1919

2020
if (products.length > this.options.productsInRow) {
21-
headings = $('<table/>')
21+
headings = $('<table></table>')
2222
.addClass('comparison headings data table')
2323
.insertBefore(elem.closest('.container'));
2424

@@ -35,7 +35,7 @@ define([
3535

3636
thCopy.css('height', height)
3737
.appendTo(headings)
38-
.wrap('<tr />');
38+
.wrap('<tr></tr>');
3939
});
4040
});
4141
}

‎app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Stock.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ protected function _getJs($quantityFieldId, $inStockFieldId)
223223
!(event && event.type == 'keyup')
224224
) {
225225
if (useConfigManageStockField.val() == 1) {
226-
useConfigManageStockField.removeAttr('checked').val(0);
226+
useConfigManageStockField.prop('checked', false).val(0);
227227
}
228228
manageStockField.toggleClass('disabled', false).prop('disabled', false);
229229
manageStockField.val(manageStockValue);

‎app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<?php else: ?>
4545
<?php $scriptString = <<<script
4646
require(['jquery'], function ($) {
47-
$('a.action.showcart').click(function() {
47+
$('a.action.showcart').on('click', function() {
4848
$(document.body).trigger('processStart');
4949
});
5050
});

‎app/code/Magento/Customer/view/adminhtml/web/edit/tab/js/addresses.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ define([
369369
regionValue = this.options.regionElement.attr('value');
370370

371371
$.each(data, function (idx, item) {
372-
var regionOption = $('<option />').val(item.value).text(item.label);
372+
var regionOption = $('<option></option>').val(item.value).text(item.label);
373373

374374
if (regionValue && regionValue == item.label) { //eslint-disable-line eqeqeq
375375
regionOption.attr('selected', 'selected');

‎app/code/Magento/Integration/view/adminhtml/web/js/integration.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ define([
299299
}
300300

301301
if (popup.length === 0) {
302-
popup = $('<div/>');
302+
popup = $('<div></div>');
303303
}
304304
popup.html(popupHtml);
305305

‎app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ define([
157157

158158
this._initialize();
159159

160-
this.element.append('<div/>');
160+
this.element.append('<div></div>');
161161

162162
this._on(window, {
163163

@@ -321,7 +321,7 @@ define([
321321
timestamp +
322322
additionalParams;
323323
this.element.append(
324-
$('<iframe/>')
324+
$('<iframe></iframe>')
325325
.attr('frameborder', 0)
326326
.attr('id', 'vimeo' + this._code + timestamp)
327327
.attr('width', this._width)

‎app/code/Magento/ProductVideo/view/frontend/web/js/load-player.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ define([
160160

161161
this._initialize();
162162

163-
this.element.append('<div/>');
163+
this.element.append('<div></div>');
164164

165165
this._on(window, {
166166

@@ -334,7 +334,7 @@ define([
334334
timestamp +
335335
additionalParams;
336336
this.element.append(
337-
$('<iframe/>')
337+
$('<iframe></iframe>')
338338
.attr('frameborder', 0)
339339
.attr('id', 'vimeo' + this._code + timestamp)
340340
.attr('width', this._width)

‎app/code/Magento/Swatches/view/adminhtml/web/js/form/element/swatch-visual.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,11 +184,11 @@ define([
184184
display: 'none'
185185
}).appendTo($('body'));
186186

187-
this.iframe = $('<iframe />', {
187+
this.iframe = $('<iframe></iframe>', {
188188
name: 'upload_iframe_' + elementName
189189
}).appendTo(this.wrapper);
190190

191-
this.form = $('<form />', {
191+
this.form = $('<form></form>', {
192192
name: 'swatch_form_image_upload_' + elementName,
193193
target: 'upload_iframe_' + elementName,
194194
method: 'post',

‎app/code/Magento/Swatches/view/adminhtml/web/js/visual.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,12 +318,12 @@ define([
318318
display: 'none'
319319
}).appendTo($('body'));
320320

321-
this.iframe = $('<iframe />', {
321+
this.iframe = $('<iframe></iframe>', {
322322
id: 'upload_iframe',
323323
name: 'upload_iframe'
324324
}).appendTo(this.wrapper);
325325

326-
this.form = $('<form />', {
326+
this.form = $('<form></form>', {
327327
id: 'swatch_form_image_upload',
328328
name: 'swatch_form_image_upload',
329329
target: 'upload_iframe',

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ var config = {
2222
'mage/new-gallery': ['jquery'],
2323
'mage/webapi': ['jquery'],
2424
'jquery/ui': ['jquery'],
25-
'MutationObserver': ['es6-collections'],
2625
'matchMedia': {
2726
'exports': 'mediaCheck'
2827
},

‎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/code/Magento/Ui/view/base/requirejs-config.js

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,6 @@ var config = {
3636
* Adds polyfills only for browser contexts which prevents bundlers from including them.
3737
*/
3838
if (typeof window !== 'undefined' && window.document) {
39-
/**
40-
* Polyfill Map and WeakMap for older browsers that do not support them.
41-
*/
42-
if (typeof Map === 'undefined' || typeof WeakMap === 'undefined') {
43-
config.deps.push('es6-collections');
44-
}
45-
46-
/**
47-
* Polyfill MutationObserver only for the browsers that do not support it.
48-
*/
49-
if (typeof MutationObserver === 'undefined') {
50-
config.deps.push('MutationObserver');
51-
}
52-
5339
/**
5440
* Polyfill FormData object for old browsers that don't have full support for it.
5541
*/

‎app/code/Magento/Ui/view/base/web/js/form/client.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ define([
6060
* @param {String} msg
6161
*/
6262
insertMethod: function (msg) {
63-
var $wrapper = $('<div/>').addClass(messagesClass).html(msg);
63+
var $wrapper = $('<div></div>').addClass(messagesClass).html(msg);
6464

6565
$('.page-main-actions', selectorPrefix).after($wrapper);
6666
$('html, body').animate({

‎app/code/Magento/Ui/view/base/web/js/form/components/insert-form.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ define([
124124
* @param {String} actions
125125
*/
126126
renderActions: function (actions) {
127-
var $container = $('<div/>');
127+
var $container = $('<div></div>');
128128

129129
$container
130130
.addClass(this.actionsContainerClass)

‎app/code/Magento/Ui/view/base/web/js/grid/columns/thumbnail.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ define([
8787
linkText: $.mage.__('Go to Details Page')
8888
}
8989
),
90-
previewPopup = $('<div/>').html(modalHtml);
90+
previewPopup = $('<div></div>').html(modalHtml);
9191

9292
previewPopup.modal({
9393
title: this.getAlt(row),

‎app/code/Magento/Ui/view/base/web/js/grid/filters/filters.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ define([
420420
* @param {String} message
421421
*/
422422
insertMethod: function (message) {
423-
var $wrapper = $('<div/>').html(message);
423+
var $wrapper = $('<div></div>').html(message);
424424

425425
$('.page-main-actions').after($wrapper);
426426
}

‎app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/i18n.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ define([
119119
return $(el).next('span');
120120
}
121121

122-
return $('<span/>').insertAfter(el);
122+
return $('<span></span>').insertAfter(el);
123123
}
124124

125125
return el;

‎app/code/Magento/Ui/view/base/web/js/modal/modalToggle.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ define([
1919
if (config.contentSelector) {
2020
content = $(config.contentSelector);
2121
} else if (config.content) {
22-
content = $('<div />').html(config.content);
22+
content = $('<div></div>').html(config.content);
2323
} else {
24-
content = $('<div />');
24+
content = $('<div></div>');
2525
}
2626

2727
widget = content.modal(config);

‎app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<label class="admin__control-support-text" data-bind="text: $t('per page')"></label>
3030
<div class="admin__data-grid-pager">
3131
<button class="action-previous" type="button" data-bind="attr: {title: $t('Previous Page')}, click: previousPage, disable: isFirst()"></button>
32-
<input class="admin__control-text" type="number" data-bind="attr: {id: ++ko.uid}, value: currentPage">
32+
<input class="admin__control-text" type="number" data-bind="attr: {id: ++ko.uid}, value: currentPage"/>
3333
<label class="admin__control-support-text" data-bind="attr: {for: ko.uid}, text: 'of ' + pages()"></label>
3434
<button class="action-next" type="button" data-bind="attr: {title: $t('Next Page')}, click: nextPage, disable: isLast()"></button>
3535
</div>

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

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

‎app/code/Magento/Variable/view/adminhtml/web/variables.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ define([
175175
* @param {String} message
176176
*/
177177
insertMethod: function (message) {
178-
$wrapper = jQuery('<div/>').html(message);
178+
$wrapper = jQuery('<div></div>').html(message);
179179

180180
jQuery('.modal-header .page-main-actions').after($wrapper);
181181
}

‎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>

‎composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
"ext-zip": "*",
3030
"lib-libxml": "*",
3131
"colinmollenhour/cache-backend-file": "~1.4.1",
32-
"colinmollenhour/cache-backend-redis": "1.11.0",
33-
"colinmollenhour/credis": "1.11.1",
32+
"colinmollenhour/cache-backend-redis": "^1.14",
33+
"colinmollenhour/credis": "1.12.1",
3434
"colinmollenhour/php-redis-session-abstract": "~1.4.0",
3535
"composer/composer": "^1.9 || ^2.0",
3636
"elasticsearch/elasticsearch": "~7.11.0",
@@ -76,9 +76,9 @@
7676
"symfony/process": "~4.4.0",
7777
"tedivm/jshrink": "~1.4.0",
7878
"tubalmartin/cssmin": "4.1.1",
79+
"web-token/jwt-framework": "^v2.2.7",
7980
"webonyx/graphql-php": "^0.13.8",
80-
"wikimedia/less.php": "^3.0.0",
81-
"web-token/jwt-framework": "^v2.2.7"
81+
"wikimedia/less.php": "^3.0.0"
8282
},
8383
"require-dev": {
8484
"allure-framework/allure-phpunit": "~1.4",

0 commit comments

Comments
 (0)