Changes for page Embed content Macro
Last modified by Ryan C on 2025/04/30 07:54
Show context
Hide context
Summary
Details
-
Page properties
-
- Content
-
... ... @@ -38,6 +38,12 @@ 38 38 39 39 {{embed attachment="test-vid.webm"/}} 40 40 41 +{{code}} 42 +{{embed attachment="test-vid.webm" videoPoster="video_poster.png"/}} 43 +{{/code}} 44 + 45 +{{embed attachment="test-vid.webm" videoPoster="video_poster.png"/}} 46 + 41 41 == DASH == 42 42 43 43 {{code}}
-
video_poster.png
-
- Author
-
... ... @@ -1,0 +1,1 @@ 1 +XWiki.AdminAngriff - Size
-
... ... @@ -1,0 +1,1 @@ 1 +82.8 KB -
Content
-
XWiki.WikiMacroClass[0]
-
- Macro code
-
... ... @@ -15,9 +15,10 @@ 15 15 #end 16 16 #if ($videoAttachmentDoc.getAttachment($videoAttachmentName)) 17 17 #set ($videoURL = $videoAttachmentDoc.getAttachmentURL($videoAttachmentName)) 18 - #set ($videoPoster = '') 18 + #set ($videoPosterParam = '') 19 19 #if ($videoAttachmentDoc.getAttachment($xcontext.macro.params.videoPoster)) 20 20 #set ($videoPoster = $videoAttachmentDoc.getAttachmentURL($xcontext.macro.params.videoPoster)) 21 + #set ($videoPosterParam = " poster=${escapetool.q}$escapetool.xml(${videoPoster})${escapetool.q}") 21 21 #end 22 22 #set ($supportedVideoFormats = ['mp4', 'webm', 'ogv', 'mov', 'avi', 'mkv', 'flv']) 23 23 #set ($formatIndex = $videoAttachmentName.lastIndexOf('.')) ... ... @@ -42,8 +42,8 @@ 42 42 {{html clean="false"}} 43 43 <div $!embedContainerClass> 44 44 <video class="video-js vjs-default-skin vjs-big-play-centered $!embedItemClass" controls preload="auto" 45 - width="$widthParam" height="$heightParam" poster="$!videoPoster"data-setup=''>46 - <source src="$!videoURL" type="video/$!videoMimeType" /> 46 + width="$widthParam" height="$heightParam" $videoPosterParam data-setup=''> 47 + <source src="$escapetool.xml($!videoURL)" type="video/$escapetool.xml($!videoMimeType)" /> 47 47 </video> 48 48 </div> 49 49 {{/html}} ... ... @@ -70,7 +70,7 @@ 70 70 {{html clean="false"}} 71 71 <div $!embedContainerClass> 72 72 <video class="dashvideo video-js vjs-default-skin $!embedItemClass" controls preload="auto" width="$widthParam" height="$heightParam"> 73 - <source src="$!manifestFileURL" type="application/dash+xml"> 74 + <source src="$escapetool.xml($!manifestFileURL)" type="application/dash+xml"> 74 74 </video> 75 75 </div> 76 76 {{/html}} - Default categories
-
... ... @@ -1,0 +1,1 @@ 1 +Content
