Skip to content

Commit

Permalink
Merge pull request #104 from cloudinary/v1.16.1
Browse files Browse the repository at this point in the history
v1.16.1
  • Loading branch information
Pniel (Pini) Cohen authored Sep 13, 2021
2 parents 8ee2420 + b3e260d commit 5b52107
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion composer.json
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.16.0",
"version": "1.16.1",
"license": "MIT",
"require": {
"cloudinary/cloudinary_php": "^1.20.0"
Expand Down
2 changes: 1 addition & 1 deletion etc/module.xml
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.16.0">
<module name="Cloudinary_Cloudinary" setup_version="1.16.1">
<sequence>
<module name="Magento_ProductVideo"/>
<module name="Magento_PageBuilder"/>
Expand Down
2 changes: 1 addition & 1 deletion marketplace.composer.json
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.16.0",
"version": "1.16.1",
"license": "MIT",
"require": {
"cloudinary/cloudinary_php": "^1.20.0"
Expand Down
4 changes: 2 additions & 2 deletions view/adminhtml/web/js/cloudinary-media-library-modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ define([
asset.asset_derived_image_url
.replace(new RegExp('^.*cloudinary.com/(' + this.options.cloudinaryMLoptions.cloud_name + '/)?' + asset.resource_type + '/' + asset.type + '/'), '')
.replace(/\.[^/.]+$/, '')
.replace(new RegExp('\/' + widget.escapeRegex(encodeURIComponent(asset.public_id)) + '$'), '')
.replace(new RegExp('\/' + widget.escapeRegex(encodeURI(asset.public_id)) + '$'), '')
.replace(new RegExp('\/v[0-9]{1,10}$'), '')
.replace(new RegExp('\/'), ',');
if (widget.options.useDerived) {
Expand All @@ -126,7 +126,7 @@ define([
asset.asset_image_url = asset.asset_url
.replace(/\.[^/.]+$/, "")
.replace(new RegExp('\/v[0-9]{1,10}\/'), '/')
.replace(new RegExp('\/(' + widget.escapeRegex(encodeURIComponent(asset.public_id)) + ')$'), '/so_auto/$1.jpg');
.replace(new RegExp('\/(' + widget.escapeRegex(encodeURI(asset.public_id)) + ')$'), '/so_auto/$1.jpg');
}
$.ajax({
url: widget.options.imageUploaderUrl,
Expand Down
2 changes: 1 addition & 1 deletion view/adminhtml/web/js/get-video-information.js
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,7 @@ define(
thumbnail = videoInfo.videoSrc
.replace(/\.[^/.]+$/, "")
.replace(new RegExp('\/v[0-9]{1,10}\/'), '/')
.replace(new RegExp('\/(' + this._escapeRegex(encodeURIComponent(tmp.public_id)) + ')$'), '/so_auto/$1.jpg');
.replace(new RegExp('\/(' + this._escapeRegex(encodeURI(tmp.public_id)) + ')$'), '/so_auto/$1.jpg');

//Fallback for video thumbnail image, use placeholder or store logo
$.ajax({
Expand Down

0 comments on commit 5b52107

Please sign in to comment.