From 7586fbb96b56afc38264c0d40a7c75c45078f6b6 Mon Sep 17 00:00:00 2001 From: Asad Saleem Date: Mon, 16 Dec 2024 19:47:27 +0500 Subject: [PATCH 1/4] CLD-338-rendering-PGW --- .../templates/default/product/bundleDetails.isml | 10 ++++++++-- .../templates/default/product/productDetails.isml | 11 ++++++++++- .../templates/default/product/setDetails.isml | 10 ++++++++-- .../default/search/components/productTiles.isml | 10 ++++++++-- .../int_cloudinary/cartridge/js/cloudinaryWidgets.js | 10 +++++----- 5 files changed, 39 insertions(+), 12 deletions(-) diff --git a/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/bundleDetails.isml b/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/bundleDetails.isml index e888163..d3c8c72 100644 --- a/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/bundleDetails.isml +++ b/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/bundleDetails.isml @@ -9,9 +9,15 @@ Custom Start: include cloudinary shrinkwrap. - diff --git a/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/productDetails.isml b/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/productDetails.isml index 4f44126..5877d27 100644 --- a/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/productDetails.isml +++ b/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/productDetails.isml @@ -9,7 +9,16 @@ Custom Start: include cloudinary shrinkwrap. - diff --git a/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/setDetails.isml b/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/setDetails.isml index ab91229..1266765 100644 --- a/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/setDetails.isml +++ b/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/setDetails.isml @@ -9,9 +9,15 @@ Custom Start: include cloudinary shrinkwrap. - diff --git a/cartridges/cloudinary_sfra_changes/cartridge/templates/default/search/components/productTiles.isml b/cartridges/cloudinary_sfra_changes/cartridge/templates/default/search/components/productTiles.isml index e73ffa9..34e2f71 100644 --- a/cartridges/cloudinary_sfra_changes/cartridge/templates/default/search/components/productTiles.isml +++ b/cartridges/cloudinary_sfra_changes/cartridge/templates/default/search/components/productTiles.isml @@ -7,9 +7,15 @@ - Custom End: include cloudinary shrinkwrap. diff --git a/cartridges/int_cloudinary/cartridge/js/cloudinaryWidgets.js b/cartridges/int_cloudinary/cartridge/js/cloudinaryWidgets.js index 5c3c2db..ce04b90 100644 --- a/cartridges/int_cloudinary/cartridge/js/cloudinaryWidgets.js +++ b/cartridges/int_cloudinary/cartridge/js/cloudinaryWidgets.js @@ -16,8 +16,8 @@ window.renderCloudinaryGalleryWidget = function () { galleryOptions.SecureDistribution = cloudinaryObj.domain; galleryOptions.privateCdn = true; } - window.cldGallery = window.cldProductGallery ? window.cldProductGallery.galleryWidget(galleryOptions) : cloudinary.galleryWidget(galleryOptions); // eslint-disable-line no-undef - cldGallery.render(); // eslint-disable-line no-undef + window.cldGallery = window.cldProductGallery ? window.cldProductGallery.galleryWidget(galleryOptions) : (cloudinary.galleryWidget && cloudinary.galleryWidget(galleryOptions)); // eslint-disable-line no-undef + window.cldGallery && cldGallery.render(); // eslint-disable-line no-undef } else if (cloudinaryObj.images && cloudinaryObj.images.imageURLs) { imgUrls = cloudinaryObj.images.imageURLs; } @@ -41,8 +41,8 @@ window.renderCloudinarySetGalleryWidgets = function () { cldSetImages.galleryWidget.options.SecureDistribution = cldObj.domain; cldSetImages.galleryWidget.options.privateCdn = true; } - window.cldGallery = window.cldProductGallery.galleryWidget(cldSetImages.galleryWidget.options); // eslint-disable-line no-undef - cldGallery.render(); // eslint-disable-line no-undef + window.cldGallery = window.cldProductGallery ? window.cldProductGallery.galleryWidget(cldSetImages.galleryWidget.options) : (cloudinary.galleryWidget && cloudinary.galleryWidget(cldSetImages.galleryWidget.options)); // eslint-disable-line no-undef + window.cldGallery && cldGallery.render(); // eslint-disable-line no-undef } }); }; @@ -82,7 +82,7 @@ window.makeCloudinaryImagesResponsive = function () { var $cldEl = $('.cloudinary-data-container'); var cloudinaryObj = $cldEl.data('cloudinary'); if ($cldResponsiveImgTags && $cldResponsiveImgTags.length > 0) { - if ( window.cldObj === undefined && window.cloudinary && window.cloudinary.default) { + if (window.cldObj === undefined && window.cloudinary && window.cloudinary.default) { window.cldObj = window.cloudinary.default.Cloudinary.new({ cloud_name: cloudinaryObj.cloudName || cloudinaryObj }); } window.cldObj && window.cldObj.responsive(); // eslint-disable-line no-undef From 9ab65cc0dbeaa7e3ec12e9e4a1fc869096563d6d Mon Sep 17 00:00:00 2001 From: Asad Saleem Date: Tue, 7 Jan 2025 18:48:43 +0500 Subject: [PATCH 2/4] update the cloudinary gallery widget script --- .../templates/default/product/bundleDetails.isml | 11 +---------- .../templates/default/product/productDetails.isml | 11 +---------- .../templates/default/product/setDetails.isml | 11 +---------- .../default/search/components/productTiles.isml | 11 +---------- 4 files changed, 4 insertions(+), 40 deletions(-) diff --git a/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/bundleDetails.isml b/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/bundleDetails.isml index d3c8c72..c4d9cbd 100644 --- a/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/bundleDetails.isml +++ b/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/bundleDetails.isml @@ -9,16 +9,7 @@ Custom Start: include cloudinary shrinkwrap. - + diff --git a/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/productDetails.isml b/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/productDetails.isml index 5877d27..3322605 100644 --- a/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/productDetails.isml +++ b/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/productDetails.isml @@ -9,16 +9,7 @@ Custom Start: include cloudinary shrinkwrap. - + diff --git a/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/setDetails.isml b/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/setDetails.isml index 1266765..03906f7 100644 --- a/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/setDetails.isml +++ b/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/setDetails.isml @@ -9,16 +9,7 @@ Custom Start: include cloudinary shrinkwrap. - + diff --git a/cartridges/cloudinary_sfra_changes/cartridge/templates/default/search/components/productTiles.isml b/cartridges/cloudinary_sfra_changes/cartridge/templates/default/search/components/productTiles.isml index 34e2f71..f88f363 100644 --- a/cartridges/cloudinary_sfra_changes/cartridge/templates/default/search/components/productTiles.isml +++ b/cartridges/cloudinary_sfra_changes/cartridge/templates/default/search/components/productTiles.isml @@ -7,16 +7,7 @@ - + Custom End: include cloudinary shrinkwrap. From 984285740779e611bacfdcb5f6cc623a559ff505 Mon Sep 17 00:00:00 2001 From: Asad Saleem Date: Wed, 15 Jan 2025 14:34:37 +0500 Subject: [PATCH 3/4] modified the gallery widget script inclusion --- .../cartridge/templates/default/product/bundleDetails.isml | 4 +--- .../templates/default/product/productDetails.isml | 4 +--- .../cartridge/templates/default/product/setDetails.isml | 7 ++++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/bundleDetails.isml b/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/bundleDetails.isml index c4d9cbd..569eef9 100644 --- a/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/bundleDetails.isml +++ b/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/bundleDetails.isml @@ -8,9 +8,6 @@ Custom Start: include cloudinary shrinkwrap. - - - @@ -53,6 +50,7 @@ Custom start: add cloudinary PGW + diff --git a/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/productDetails.isml b/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/productDetails.isml index 3322605..cff3a69 100644 --- a/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/productDetails.isml +++ b/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/productDetails.isml @@ -8,9 +8,6 @@ Custom Start: include cloudinary shrinkwrap. - - - @@ -42,6 +39,7 @@ Custom start: add cloudinary PGW + diff --git a/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/setDetails.isml b/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/setDetails.isml index 03906f7..44997cd 100644 --- a/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/setDetails.isml +++ b/cartridges/cloudinary_sfra_changes/cartridge/templates/default/product/setDetails.isml @@ -8,9 +8,6 @@ Custom Start: include cloudinary shrinkwrap. - - - @@ -55,6 +52,10 @@ + + + +
Custom start: Add cloudinary video player From bd704634bdea1d64eccbbe48c07a1ffa5a2087f7 Mon Sep 17 00:00:00 2001 From: Asad Saleem Date: Tue, 21 Jan 2025 13:50:02 +0500 Subject: [PATCH 4/4] fixed the render gallery widget --- cartridges/int_cloudinary/cartridge/js/cloudinaryWidgets.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/cartridges/int_cloudinary/cartridge/js/cloudinaryWidgets.js b/cartridges/int_cloudinary/cartridge/js/cloudinaryWidgets.js index ce04b90..6cf1f7e 100644 --- a/cartridges/int_cloudinary/cartridge/js/cloudinaryWidgets.js +++ b/cartridges/int_cloudinary/cartridge/js/cloudinaryWidgets.js @@ -90,9 +90,7 @@ window.makeCloudinaryImagesResponsive = function () { }; $(document).ready(function () { - window.renderCloudinaryGalleryWidget(); window.renderCloudinaryVideoPlayer(); - window.renderCloudinarySetGalleryWidgets(); window.makeCloudinaryImagesResponsive(); $('.icon-next, .icon-prev').on('click', function () {