Skip to content

Commit

Permalink
Merge pull request #6975 from magento-commerce/platform-health
Browse files Browse the repository at this point in the history
[Platform Health] Dependencies update
  • Loading branch information
fascinosum committed Jul 16, 2021
2 parents ab59159 + 3e1e772 commit b3aa9ff
Show file tree
Hide file tree
Showing 55 changed files with 6,456 additions and 4,732 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ define([
tmpl = $(tmpl);

this.element.html(
$('<ul />', {
$('<ul></ul>', {
'class': 'message-system-list'
}).append(tmpl)
).trigger('contentUpdated');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ define([
_initModal: function () {
var self = this;

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

/** @inheritdoc */
opened: function () {
$(this).parent().addClass('modal-content-new-attribute');
self.iframe = $('<iframe id="create_new_attribute_container">').attr({
self.iframe = $('<iframe id="create_new_attribute_container"></iframe>').attr({
src: self._prepareUrl(),
frameborder: 0
});
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Catalog/view/frontend/web/js/list.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ define([
headings;

if (products.length > this.options.productsInRow) {
headings = $('<table/>')
headings = $('<table></table>')
.addClass('comparison headings data table')
.insertBefore(elem.closest('.container'));

Expand All @@ -35,7 +35,7 @@ define([

thCopy.css('height', height)
.appendTo(headings)
.wrap('<tr />');
.wrap('<tr></tr>');
});
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ protected function _getJs($quantityFieldId, $inStockFieldId)
!(event && event.type == 'keyup')
) {
if (useConfigManageStockField.val() == 1) {
useConfigManageStockField.removeAttr('checked').val(0);
useConfigManageStockField.prop('checked', false).val(0);
}
manageStockField.toggleClass('disabled', false).prop('disabled', false);
manageStockField.val(manageStockValue);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<?php else: ?>
<?php $scriptString = <<<script
require(['jquery'], function ($) {
$('a.action.showcart').click(function() {
$('a.action.showcart').on('click', function() {
$(document.body).trigger('processStart');
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ define([
regionValue = this.options.regionElement.attr('value');

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

if (regionValue && regionValue == item.label) { //eslint-disable-line eqeqeq
regionOption.attr('selected', 'selected');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ define([
}

if (popup.length === 0) {
popup = $('<div/>');
popup = $('<div></div>');
}
popup.html(popupHtml);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ define([

this._initialize();

this.element.append('<div/>');
this.element.append('<div></div>');

this._on(window, {

Expand Down Expand Up @@ -321,7 +321,7 @@ define([
timestamp +
additionalParams;
this.element.append(
$('<iframe/>')
$('<iframe></iframe>')
.attr('frameborder', 0)
.attr('id', 'vimeo' + this._code + timestamp)
.attr('width', this._width)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ define([

this._initialize();

this.element.append('<div/>');
this.element.append('<div></div>');

this._on(window, {

Expand Down Expand Up @@ -334,7 +334,7 @@ define([
timestamp +
additionalParams;
this.element.append(
$('<iframe/>')
$('<iframe></iframe>')
.attr('frameborder', 0)
.attr('id', 'vimeo' + this._code + timestamp)
.attr('width', this._width)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,11 +184,11 @@ define([
display: 'none'
}).appendTo($('body'));

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

this.form = $('<form />', {
this.form = $('<form></form>', {
name: 'swatch_form_image_upload_' + elementName,
target: 'upload_iframe_' + elementName,
method: 'post',
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Swatches/view/adminhtml/web/js/visual.js
Original file line number Diff line number Diff line change
Expand Up @@ -318,12 +318,12 @@ define([
display: 'none'
}).appendTo($('body'));

this.iframe = $('<iframe />', {
this.iframe = $('<iframe></iframe>', {
id: 'upload_iframe',
name: 'upload_iframe'
}).appendTo(this.wrapper);

this.form = $('<form />', {
this.form = $('<form></form>', {
id: 'swatch_form_image_upload',
name: 'swatch_form_image_upload',
target: 'upload_iframe',
Expand Down
1 change: 0 additions & 1 deletion app/code/Magento/Theme/view/base/requirejs-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ var config = {
'mage/new-gallery': ['jquery'],
'mage/webapi': ['jquery'],
'jquery/ui': ['jquery'],
'MutationObserver': ['es6-collections'],
'matchMedia': {
'exports': 'mediaCheck'
},
Expand Down
1 change: 0 additions & 1 deletion app/code/Magento/Theme/view/frontend/requirejs-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ var config = {
}
},
deps: [
'jquery/jquery.mobile.custom',
'mage/common',
'mage/dataPost',
'mage/bootstrap'
Expand Down
14 changes: 0 additions & 14 deletions app/code/Magento/Ui/view/base/requirejs-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,6 @@ var config = {
* Adds polyfills only for browser contexts which prevents bundlers from including them.
*/
if (typeof window !== 'undefined' && window.document) {
/**
* Polyfill Map and WeakMap for older browsers that do not support them.
*/
if (typeof Map === 'undefined' || typeof WeakMap === 'undefined') {
config.deps.push('es6-collections');
}

/**
* Polyfill MutationObserver only for the browsers that do not support it.
*/
if (typeof MutationObserver === 'undefined') {
config.deps.push('MutationObserver');
}

/**
* Polyfill FormData object for old browsers that don't have full support for it.
*/
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Ui/view/base/web/js/form/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ define([
* @param {String} msg
*/
insertMethod: function (msg) {
var $wrapper = $('<div/>').addClass(messagesClass).html(msg);
var $wrapper = $('<div></div>').addClass(messagesClass).html(msg);

$('.page-main-actions', selectorPrefix).after($wrapper);
$('html, body').animate({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ define([
* @param {String} actions
*/
renderActions: function (actions) {
var $container = $('<div/>');
var $container = $('<div></div>');

$container
.addClass(this.actionsContainerClass)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ define([
linkText: $.mage.__('Go to Details Page')
}
),
previewPopup = $('<div/>').html(modalHtml);
previewPopup = $('<div></div>').html(modalHtml);

previewPopup.modal({
title: this.getAlt(row),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ define([
* @param {String} message
*/
insertMethod: function (message) {
var $wrapper = $('<div/>').html(message);
var $wrapper = $('<div></div>').html(message);

$('.page-main-actions').after($wrapper);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ define([
return $(el).next('span');
}

return $('<span/>').insertAfter(el);
return $('<span></span>').insertAfter(el);
}

return el;
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Ui/view/base/web/js/modal/modalToggle.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ define([
if (config.contentSelector) {
content = $(config.contentSelector);
} else if (config.content) {
content = $('<div />').html(config.content);
content = $('<div></div>').html(config.content);
} else {
content = $('<div />');
content = $('<div></div>');
}

widget = content.modal(config);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<label class="admin__control-support-text" data-bind="text: $t('per page')"></label>
<div class="admin__data-grid-pager">
<button class="action-previous" type="button" data-bind="attr: {title: $t('Previous Page')}, click: previousPage, disable: isFirst()"></button>
<input class="admin__control-text" type="number" data-bind="attr: {id: ++ko.uid}, value: currentPage">
<input class="admin__control-text" type="number" data-bind="attr: {id: ++ko.uid}, value: currentPage"/>
<label class="admin__control-support-text" data-bind="attr: {for: ko.uid}, text: 'of ' + pages()"></label>
<button class="action-next" type="button" data-bind="attr: {title: $t('Next Page')}, click: nextPage, disable: isLast()"></button>
</div>
Expand Down
41 changes: 0 additions & 41 deletions app/code/Magento/User/view/adminhtml/web/app-config.js

This file was deleted.

2 changes: 1 addition & 1 deletion app/code/Magento/Variable/view/adminhtml/web/variables.js
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ define([
* @param {String} message
*/
insertMethod: function (message) {
$wrapper = jQuery('<div/>').html(message);
$wrapper = jQuery('<div></div>').html(message);

jQuery('.modal-header .page-main-actions').after($wrapper);
}
Expand Down
1 change: 0 additions & 1 deletion app/design/adminhtml/Magento/backend/etc/view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
<item type="file">Lib::mage/requirejs/static.js</item>
<item type="file">Lib::jquery/jquery.min.js</item>
<item type="file">Lib::jquery/jquery.parsequery.js</item>
<item type="file">Lib::jquery/jquery.mobile.custom.js</item>
<item type="file">Lib::jquery/jquery-ui.js</item>
<item type="file">Lib::matchMedia.js</item>
<item type="file">Lib::requirejs/require.js</item>
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
"ext-zip": "*",
"lib-libxml": "*",
"colinmollenhour/cache-backend-file": "~1.4.1",
"colinmollenhour/cache-backend-redis": "1.11.0",
"colinmollenhour/credis": "1.11.1",
"colinmollenhour/cache-backend-redis": "^1.14",
"colinmollenhour/credis": "1.12.1",
"colinmollenhour/php-redis-session-abstract": "~1.4.0",
"composer/composer": "^1.9 || ^2.0",
"elasticsearch/elasticsearch": "~7.11.0",
Expand Down Expand Up @@ -76,9 +76,9 @@
"symfony/process": "~4.4.0",
"tedivm/jshrink": "~1.4.0",
"tubalmartin/cssmin": "4.1.1",
"web-token/jwt-framework": "^v2.2.7",
"webonyx/graphql-php": "^0.13.8",
"wikimedia/less.php": "^3.0.0",
"web-token/jwt-framework": "^v2.2.7"
"wikimedia/less.php": "^3.0.0"
},
"require-dev": {
"allure-framework/allure-phpunit": "~1.4",
Expand Down

0 comments on commit b3aa9ff

Please sign in to comment.