Merge pull request #6860 from magento-lynx/jquery-upgrade

[LYNX] Jquery upgrade compatibility changes

Author: joanhe

app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml

@@ -159,9 +159,9 @@ Bundle.Selection.prototype = {
             $grid.find('.checkbox').prop({checked: false});
 
             var checkRowBySku = function (sku) {
-                sku = $.trim(sku);
+                sku = sku.trim();
                 $grid.find('.sku').filter(function () {
-                    return $.trim($(this).text()) == sku;
+                    return $(this).text().trim() == sku;
                 }).closest('tr').find('.checkbox').prop({checked: true});
             };
             $.each(bSelection.gridSelection.values().pop().toArray(), function () {

app/code/Magento/Bundle/view/adminhtml/web/js/bundle-product.js

@@ -146,8 +146,8 @@ define([
 
                         if ($(this).is(':checked')) {
                             selectedProductList[$(this).val()] = {
-                                name: $.trim(tr.find('.col-name').html()),
-                                sku: $.trim(tr.find('.col-sku').html()),
+                                name: tr.find('.col-name').html().trim(),
+                                sku: tr.find('.col-sku').html().trim(),
                                 'product_id': $(this).val(),
                                 'option_id': $('bundle_selection_id_' + optionIndex).val(),
                                 'selection_price_value': 0,
@@ -186,7 +186,7 @@ define([
                                 });
                                 bSelection.gridRemoval.each(function (pair) {
                                     $optionBox.find('.col-sku').filter(function () {
-                                        return $.trim($(this).text()) === pair.key; // find row by SKU
+                                        return $(this).text().trim() === pair.key; // find row by SKU
                                     }).closest('tr').find('button.delete').trigger('click');
                                 });
                                 widget.refreshSortableElements();

app/code/Magento/Bundle/view/frontend/web/js/product-summary.js

@@ -77,7 +77,7 @@ define([
                     .closest(this.options.summaryContainer)
                     .find(this.options.templates.summaryBlock)
                     .html();
-                template = mageTemplate($.trim(template), {
+                template = mageTemplate(template.trim(), {
                     data: {
                         _label_: this.cache.currentElement.options[key].title
                     }
@@ -107,7 +107,7 @@ define([
                 .closest(this.options.summaryContainer)
                 .find(this.options.templates.optionBlock)
                 .html();
-            template = mageTemplate($.trim(template), {
+            template = mageTemplate(template.trim(), {
                 data: {
                     _quantity_: this.cache.currentElement.options[this.cache.currentKey].selections[optionIndex].qty,
                     _label_: this.cache.currentElement.options[this.cache.currentKey].selections[optionIndex].name

app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js

@@ -104,7 +104,7 @@ define([
                 }
             });
 
-            if ($.isArray(addrs.street)) {
+            if (Array.isArray(addrs.street)) {
                 streetObject = {};
                 addrs.street.forEach(function (value, index) {
                     streetObject[index] = value;
@@ -113,7 +113,7 @@ define([
             }
 
             //jscs:disable requireCamelCaseOrUpperCaseIdentifiers
-            if ($.isArray(addrs.customAttributes)) {
+            if (Array.isArray(addrs.customAttributes)) {
                 customAttributesObject = {};
                 addrs.customAttributes.forEach(function (value) {
                     customAttributesObject[value.attribute_code] = value.value;

app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/attributes_values.js

@@ -106,7 +106,7 @@ define([
                 errorOption,
                 allOptions = [];
 
-            newOption.label = $.trim(newOption.label);
+            newOption.label = newOption.label.trim();
 
             if (_.isEmpty(newOption.label)) {
                 return false;

app/code/Magento/GroupedProduct/view/adminhtml/web/js/grouped-product.js

@@ -159,7 +159,7 @@ define([
                         product.id = element.val();
                         product.qty = 0;
                         element.closest('[data-role=row]').find('[data-column]').each(function (index, el) {
-                            product[$(el).data('column')] = $.trim($(el).text());
+                            product[$(el).data('column')] = $(el).text().trim();
                         });
                         selectedProductList[product.id] = product;
                     } else {

app/code/Magento/PageCache/view/frontend/web/js/page-cache.js

@@ -65,7 +65,7 @@ define([
             contents = function (elem) {
                 return $.map(elem, function (el) {
                     try {
-                        return $.nodeName(el, 'iframe') ?
+                        return el.nodeName.toLowerCase() === 'iframe' ?
                             el.contentDocument || (el.contentWindow ? el.contentWindow.document : []) :
                             $.merge([], el.childNodes);
                     } catch (e) {

app/code/Magento/Paypal/view/frontend/web/js/order-review.js

@@ -285,7 +285,7 @@ define([
             isChecked = $(this.options.billingAsShippingSelector).is(':checked');
             formData = null;
             callBackResponseHandler = null;
-            shippingMethod = $.trim($(this.options.shippingSelector).val());
+            shippingMethod = $(this.options.shippingSelector).val().trim();
             this._shippingTobilling();
 
             if (url && resultId && shippingMethod) {
@@ -358,7 +358,7 @@ define([
          * Actions on change Shipping Address data
          */
         _onShippingChange: function () {
-            if (this.triggerPropertyChange && $.trim($(this.options.shippingSelector).val())) {
+            if (this.triggerPropertyChange && $(this.options.shippingSelector).val().trim()) {
                 this.element.find(this.options.shippingSelector).hide().end()
                     .find(this.options.shippingSelector + '_update').show();
             }

app/code/Magento/ProductVideo/view/adminhtml/web/js/new-video-dialog.js

@@ -628,7 +628,7 @@ define([
             }).css('display', 'none');
             fu.parent().append(tmpInput);
             fileUploader = $(tmpInput).fileupload();
-            fileUploader.fileupload('send', data).success(function (result, textStatus, jqXHR) {
+            fileUploader.fileupload('send', data).done(function (result, textStatus, jqXHR) {
                 tmpInput.remove();
                 callback.call(null, result, textStatus, jqXHR);
             });

app/code/Magento/Swatches/view/base/web/js/swatch-renderer.js

@@ -106,7 +106,7 @@ define([
             $title = $element.find('.title');
             $corner = $element.find('.corner');
 
-            $this.hover(function () {
+            $this.on('mouseenter', function () {
                 if (!$this.hasClass('disabled')) {
                     timer = setTimeout(
                         function () {
@@ -168,7 +168,9 @@ define([
                         $widget.options.delay
                     );
                 }
-            }, function () {
+            });
+
+            $this.on('mouseleave', function () {
                 $element.hide();
                 clearTimeout(timer);
             });