-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into CLD-304-bump-version
- Loading branch information
Showing
8 changed files
with
79 additions
and
49 deletions.
There are no files selected for viewing
1 change: 0 additions & 1 deletion
1
cartridges/bm_cloudinary_pd/cartridge/scripts/cloudinary/version.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,3 @@ | ||
| { | ||
| "videoPlayerVersion": "1.10.1", | ||
| "version": "24.1.2" | ||
| } |
3 changes: 1 addition & 2 deletions
3
cartridges/int_cloudinary_pd/cartridge/scripts/cloudinary/version.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,3 @@ | ||
| { | ||
| "version": "24.1.2", | ||
| "videoPlayerVersion": "1.10.1" | ||
| "version": "24.1.2" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 22 additions & 12 deletions
34
example/cld_custom_i9n/cartridge/templates/default/experience/components/assets/example.isml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,35 @@ | ||
| <!--- TEMPLATENAME: example.isml ---> | ||
| <iscomment> TEMPLATENAME: example.isml </iscomment> | ||
| <isset name="sitePref" value="${dw.system.Site.current.preferences.custom}" scope="page" /> | ||
|
|
||
| <isscript> | ||
| // SFRA has a logic bug where full urls are added twice, so we need to check for duplicates before adding. | ||
| assets = require('*/cartridge/scripts/assets.js'); | ||
| var assets = require('*/cartridge/scripts/assets.js'); | ||
| pdict.viewmodel.CLDPDVideoPlayerJSURL = sitePref.CLDPDVideoPlayerJSURL; | ||
| pdict.viewmodel.CLDPDShrinkwrapJSURL = sitePref.CLDPDShrinkwrapJSURL; | ||
|
|
||
| assets.addJs('*/js/cloudinaryImages.js'); | ||
| </isscript> | ||
|
|
||
|
|
||
| <script> | ||
| var value = JSON.parse('<isprint value="${JSON.stringify(pdict.viewmodel)}" encoding="jsonvalue"/>'); | ||
| window.cldImages = window.cldImages || []; | ||
| window.cldImages.push(value); | ||
| window.cloudName = value.cloudName; | ||
| window.cname = value.cname || null; | ||
| console.log(value); | ||
| var value = JSON.parse('<isprint value="${JSON.stringify(pdict.viewmodel)}" encoding="jsonvalue"/>'); | ||
| window.cldImages = window.cldImages || []; | ||
| window.cldImages.push(value); | ||
| window.cloudName = value.cloudName; | ||
| window.cname = value.cname || null; | ||
|
|
||
| // Cloudinary Core JS | ||
| const script = document.querySelector('script[src="'+value.CLDPDVideoPlayerJSURL+'"]'); | ||
| if (script === null) { | ||
| var shrinkWrap = document.createElement('script'); | ||
| shrinkWrap.src = value.CLDPDShrinkwrapJSURL; | ||
| document.body.appendChild(shrinkWrap); | ||
| } | ||
| </script> | ||
|
|
||
| <h2>${pdict.headline}</h2> | ||
| <div class="cloudinary-media-library-container sfdc-component-mock sfdc-component-assets-media_library-mock"> | ||
| <img class="component-media_library ml-image" src="${pdict.viewmodel.placeholder}" data-real-url="${pdict.viewmodel.src}" | ||
| id="${pdict.viewmodel.id}" | ||
| alt="${pdict.viewmodel.altText}" | ||
| style="max-width: 100%"> | ||
| <img class="component-media_library ml-image" src="${pdict.viewmodel.placeholder}" | ||
| data-real-url="${pdict.viewmodel.src}" id="${pdict.viewmodel.id}" alt="${pdict.viewmodel.altText}" | ||
| style="max-width: 100%"> | ||
| </div> |
27 changes: 16 additions & 11 deletions
27
...cld_custom_i9n/cartridge/templates/default/experience/components/assets/videoExample.isml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,35 +1,40 @@ | ||
| <!--- TEMPLATENAME: example.isml ---> | ||
| <iscomment> TEMPLATENAME: example.isml </iscomment> | ||
| <isset name="sitePref" value="${dw.system.Site.current.preferences.custom}" scope="page" /> | ||
|
|
||
| <isscript> | ||
| // SFRA has a logic bug where full urls are added twice, so we need to check for duplicates before adding. | ||
| var assets = require('*/cartridge/scripts/assets.js'); | ||
| var verJson = require('*/cartridge/scripts/cloudinary/version.json'); | ||
|
|
||
|
|
||
| // Video Player CSS | ||
| var src = 'https://unpkg.com/cloudinary-video-player@'+verJson.videoPlayerVersion+'/dist/cld-video-player.min.css'; | ||
| var src = sitePref.CLDPDVideoPlayerCSSURL; | ||
| if (assets.styles.lastIndexOf(src) < 0) { | ||
| assets.addCss(src); | ||
| } | ||
|
|
||
| // Cloudinary Video Player JS | ||
| src = 'https://unpkg.com/cloudinary-video-player@'+verJson.videoPlayerVersion+'/dist/cld-video-player.min.js'; | ||
| src = sitePref.CLDPDVideoPlayerJSURL; | ||
| if (assets.scripts.lastIndexOf(src) < 0) { | ||
| assets.addJs(src); | ||
| } | ||
|
|
||
| pdict.viewmodel.CLDPDShrinkwrapJSURL = sitePref.CLDPDShrinkwrapJSURL; | ||
| assets.addJs('/js/cloudinaryVideos.js'); | ||
| </isscript> | ||
|
|
||
| <h2>${pdict.headline}</h2> | ||
| <div class="cloudinary-video-container sfdc-component-mock sfdc-component-assets-media_library_video-mock"> | ||
| <video id="${pdict.viewmodel.id}"></video> | ||
| <script> | ||
| var value = JSON.parse('<isprint value="${JSON.stringify(pdict.viewmodel)}" encoding="jsonvalue"/>'); | ||
| window.players = window.players || []; | ||
| window.players.push(value); | ||
| window.cloudName = value.cloudName; | ||
| window.cname = value.cname || null; | ||
| var value = JSON.parse('<isprint value="${JSON.stringify(pdict.viewmodel)}" encoding="jsonvalue"/>'); | ||
| window.players = window.players || []; | ||
| window.players.push(value); | ||
| window.cloudName = value.cloudName; | ||
| window.cname = value.cname || null; | ||
|
|
||
| // Check if the Cloudinary Core JS is inculded | ||
| const shrinkWrapJs = document.querySelector('script[src="'+value.CLDPDShrinkwrapJSURL+'"]'); | ||
| if (shrinkWrapJs) { | ||
| shrinkWrapJs.parentNode.removeChild(shrinkWrapJs); | ||
| } | ||
| </script> | ||
| </div> | ||
|
|
Binary file not shown.