From 84a457b2bd31987240166a96e4a18c4537d3403a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Cuerdo=20=C3=81lvarez?= Date: Thu, 20 May 2021 17:03:38 +0200 Subject: [PATCH] MC-41987: Fix jQuery.isFunction() (#39) * MC-41987: Fix jQuery.isFunction() - Replace isFunction() * MC-41987: Fix jQuery.isFunction() - Replace isFunction() --- .../Catalog/view/adminhtml/web/catalog/product-attributes.js | 2 +- .../Checkout/view/frontend/web/js/model/address-converter.js | 2 +- lib/web/mage/backend/validation.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/product-attributes.js b/app/code/Magento/Catalog/view/adminhtml/web/catalog/product-attributes.js index 31d4f7a762804..606f852b7247f 100644 --- a/app/code/Magento/Catalog/view/adminhtml/web/catalog/product-attributes.js +++ b/app/code/Magento/Catalog/view/adminhtml/web/catalog/product-attributes.js @@ -47,7 +47,7 @@ define([ closed: function () { var doc = self.iframe.get(0).document; - if (doc && $.isFunction(doc.execCommand)) { + if (doc && typeof doc.execCommand === 'function') { //IE9 break script loading but not execution on iframe removing doc.execCommand('stop'); self.iframe.remove(); diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js b/app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js index 724bab5231f7f..6f89c4bfe988f 100644 --- a/app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js +++ b/app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js @@ -99,7 +99,7 @@ define([ customAttributesObject; $.each(addrs, function (key) { - if (addrs.hasOwnProperty(key) && !$.isFunction(addrs[key])) { + if (addrs.hasOwnProperty(key) && typeof addrs[key] !== 'function') { output[self.toUnderscore(key)] = addrs[key]; } }); diff --git a/lib/web/mage/backend/validation.js b/lib/web/mage/backend/validation.js index c07fcd1542079..e19a0c8f32dd4 100644 --- a/lib/web/mage/backend/validation.js +++ b/lib/web/mage/backend/validation.js @@ -99,7 +99,7 @@ define([ * @param {HTMLElement} element */ highlight: function (element) { - if ($.validator.defaults.highlight && $.isFunction($.validator.defaults.highlight)) { + if ($.validator.defaults.highlight && typeof $.validator.defaults.highlight === 'function') { $.validator.defaults.highlight.apply(this, arguments); } $(element).trigger('highlight.validate'); @@ -109,7 +109,7 @@ define([ * @param {HTMLElement} element */ unhighlight: function (element) { - if ($.validator.defaults.unhighlight && $.isFunction($.validator.defaults.unhighlight)) { + if ($.validator.defaults.unhighlight && typeof $.validator.defaults.unhighlight === 'function') { $.validator.defaults.unhighlight.apply(this, arguments); } $(element).trigger('unhighlight.validate');