Skip to content

V1.14.2 #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pniel-cohen merged 6 commits into from
Oct 4, 2020
Merged

V1.14.2 #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
24ecd26
Merge pull request #1 from cloudinary/master
ankurvr Aug 10, 2020
4c547a0
Simplified merging of component default options and user defined options
ankurvr Aug 10, 2020
4fa6f32
ankurvr-ankurvr-patch-1: fixed conflicts
Sep 17, 2020
3bf8d69
Merge branch 'ankurvr-ankurvr-patch-1' into v1.14.2
Sep 17, 2020
d7f5508
Fixed a typo in BatchUploader.php notes
Sep 17, 2020
873cf09
v1.14.2: changed CSP whitelist
Oct 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Model/BatchUploader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.';
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "*"
Expand Down
26 changes: 0 additions & 26 deletions etc/csp_whitelist.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@
<value id="cloudinary_analytics_api" type="host">analytics-api.cloudinary.com</value>
<value id="cloudinary_cloudflare_cdnjs" type="host">cdnjs.cloudflare.com</value>
<value id="cloudinary_res" type="host">res.cloudinary.com</value>
<value id="cloudinary_res_1" type="host">res-1.cloudinary.com</value>
<value id="cloudinary_res_2" type="host">res-2.cloudinary.com</value>
<value id="cloudinary_res_3" type="host">res-3.cloudinary.com</value>
<value id="cloudinary_res_4" type="host">res-4.cloudinary.com</value>
<value id="cloudinary_res_5" type="host">res-5.cloudinary.com</value>
</values>
</policy>
<policy id="frame-src">
Expand All @@ -45,27 +40,6 @@
<value id="cloudinary_analytics_api" type="host">analytics-api.cloudinary.com</value>
<value id="cloudinary_cloudflare_cdnjs" type="host">cdnjs.cloudflare.com</value>
<value id="cloudinary_res" type="host">res.cloudinary.com</value>
<value id="cloudinary_res_1" type="host">res-1.cloudinary.com</value>
<value id="cloudinary_res_2" type="host">res-2.cloudinary.com</value>
<value id="cloudinary_res_3" type="host">res-3.cloudinary.com</value>
<value id="cloudinary_res_4" type="host">res-4.cloudinary.com</value>
<value id="cloudinary_res_5" type="host">res-5.cloudinary.com</value>
</values>
</policy>
<policy id="form-action">
<values>
<value id="cloudinary_main" type="host">cloudinary.com</value>
<value id="cloudinary_main_www" type="host">www.cloudinary.com</value>
<value id="cloudinary_api" type="host">p.cloudinary.com</value>
<value id="cloudinary_media_library" type="host">media-library.cloudinary.com</value>
<value id="cloudinary_product_gallery" type="host">product-gallery.cloudinary.com</value>
<value id="cloudinary_analytics_api" type="host">analytics-api.cloudinary.com</value>
<value id="cloudinary_res" type="host">res.cloudinary.com</value>
<value id="cloudinary_res_1" type="host">res-1.cloudinary.com</value>
<value id="cloudinary_res_2" type="host">res-2.cloudinary.com</value>
<value id="cloudinary_res_3" type="host">res-3.cloudinary.com</value>
<value id="cloudinary_res_4" type="host">res-4.cloudinary.com</value>
<value id="cloudinary_res_5" type="host">res-5.cloudinary.com</value>
</values>
</policy>
<policy id="img-src">
Expand Down
2 changes: 1 addition & 1 deletion etc/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
<module name="Cloudinary_Cloudinary" setup_version="1.14.1">
<module name="Cloudinary_Cloudinary" setup_version="1.14.2">
<sequence>
<module name="Magento_ProductVideo"/>
<module name="Magento_PageBuilder"/>
Expand Down
2 changes: 1 addition & 1 deletion marketplace.composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "*"
Expand Down
19 changes: 1 addition & 18 deletions view/base/web/js/cloudinary-lazyload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ define([

initialize: function(options) {
var widget = this;
options = this.mergeOptions(this.options, options);
options = $.extend({}, widget.options, options || {});
this.cldLazyloadInit(options);
setInterval(function() {
widget.cldLazyloadInit(options);
Expand All @@ -53,24 +53,7 @@ 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;
}

});
Expand Down