From 4c547a0ebdf302e75651e88b76d9d018400c8f3c Mon Sep 17 00:00:00 2001 From: Ankur Raiyani Date: Mon, 10 Aug 2020 10:16:16 +0530 Subject: [PATCH 1/3] Simplified merging of component default options and user defined options --- view/frontend/web/js/cloudinary-lazyload.js | 22 ++------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/view/frontend/web/js/cloudinary-lazyload.js b/view/frontend/web/js/cloudinary-lazyload.js index 22b7b6e..81ed409 100644 --- a/view/frontend/web/js/cloudinary-lazyload.js +++ b/view/frontend/web/js/cloudinary-lazyload.js @@ -28,7 +28,7 @@ define([ initialize: function(options) { var widget = this; - options = widget.mergeOptions(widget.options, options); + options = $.extend({}, widget.options, options || {}); if ($(".cloudinary-lazyload").length) { try { $(".cloudinary-lazyload").lazyload(widget.options); @@ -45,27 +45,9 @@ define([ } } - }, - - /** - * @param obj1 - * @param obj2 - * @returns object - */ - mergeOptions: function(o1, o2) { - var o1 = o1 || {}; - var o2 = o2 || {}; - var o3 = {}; - for (var attr in o1) { - o3[attr] = o1[attr]; - } - for (var attr in o2) { - o3[attr] = o2[attr]; - } - return o3; } }); return $.mage.cloudinaryLazyload; -}); \ No newline at end of file +}); From d7f55086583108ab95d61ecd03d478d282855534 Mon Sep 17 00:00:00 2001 From: pini-girit Date: Thu, 17 Sep 2020 12:11:38 +0300 Subject: [PATCH 2/3] Fixed a typo in BatchUploader.php notes --- Model/BatchUploader.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Model/BatchUploader.php b/Model/BatchUploader.php index 03e0ea6..5774888 100644 --- a/Model/BatchUploader.php +++ b/Model/BatchUploader.php @@ -9,7 +9,7 @@ class BatchUploader { - const ERROR_MIGRATION_ALREADY_RUNNING = 'Cannot start upload - a migration is in progress or was interrupted. If you are sure a migration is not running elsewhere run the cloudinary:upload:stop command before attempting another upload.'; + const ERROR_MIGRATION_ALREADY_RUNNING = 'Cannot start upload - a migration is in progress or was interrupted. If you are sure a migration is not running elsewhere run the cloudinary:migration:stop command before attempting another upload.'; const ERROR_AUTO_UPLOAD1 = 'Manual migration is not required when auto upload mapping is enabled.'; const ERROR_AUTO_UPLOAD2 = 'Please disable auto upload mapping and refresh the configuration cache ' . 'if you wish to perform a manual migration.'; From 873cf0973e47c06a3aa2181905ad5d6f5ab88c31 Mon Sep 17 00:00:00 2001 From: pini-girit Date: Sun, 4 Oct 2020 12:43:53 +0300 Subject: [PATCH 3/3] v1.14.2: changed CSP whitelist --- composer.json | 2 +- etc/csp_whitelist.xml | 26 -------------------------- etc/module.xml | 2 +- marketplace.composer.json | 2 +- 4 files changed, 3 insertions(+), 29 deletions(-) diff --git a/composer.json b/composer.json index 8b7803b..4b6f4c3 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "cloudinary/cloudinary-magento2", "description": "Cloudinary Magento 2 Integration.", "type": "magento2-module", - "version": "1.14.1", + "version": "1.14.2", "license": "MIT", "require": { "cloudinary/cloudinary_php": "*" diff --git a/etc/csp_whitelist.xml b/etc/csp_whitelist.xml index 77408fc..1fb038c 100644 --- a/etc/csp_whitelist.xml +++ b/etc/csp_whitelist.xml @@ -28,11 +28,6 @@ analytics-api.cloudinary.com cdnjs.cloudflare.com res.cloudinary.com - res-1.cloudinary.com - res-2.cloudinary.com - res-3.cloudinary.com - res-4.cloudinary.com - res-5.cloudinary.com @@ -45,27 +40,6 @@ analytics-api.cloudinary.com cdnjs.cloudflare.com res.cloudinary.com - res-1.cloudinary.com - res-2.cloudinary.com - res-3.cloudinary.com - res-4.cloudinary.com - res-5.cloudinary.com - - - - - cloudinary.com - www.cloudinary.com - p.cloudinary.com - media-library.cloudinary.com - product-gallery.cloudinary.com - analytics-api.cloudinary.com - res.cloudinary.com - res-1.cloudinary.com - res-2.cloudinary.com - res-3.cloudinary.com - res-4.cloudinary.com - res-5.cloudinary.com diff --git a/etc/module.xml b/etc/module.xml index ae50380..bf5ac10 100644 --- a/etc/module.xml +++ b/etc/module.xml @@ -1,6 +1,6 @@ - + diff --git a/marketplace.composer.json b/marketplace.composer.json index 2daf22d..0b1aaa0 100644 --- a/marketplace.composer.json +++ b/marketplace.composer.json @@ -2,7 +2,7 @@ "name": "cloudinary/cloudinary", "description": "Cloudinary Magento 2 Integration.", "type": "magento2-module", - "version": "1.14.1", + "version": "1.14.2", "license": "MIT", "require": { "cloudinary/cloudinary_php": "*"