Skip to Content
0 Votes

Changes for page Embed content Macro

Last modified by Ryan C on 2025/04/30 07:54
From version 3.1
edited by Ryan C
on 2025/04/30 07:54
Change comment: Migrated property [executionIsolated] from class [XWiki.WikiMacroClass]
To version 1.1
edited by Ryan C
on 2025/03/15 10:14
Change comment: Install extension [org.xwiki.contrib.embed:embed-macro-ui/1.1.2]

Summary

Details

Page properties
Content
... ... @@ -38,12 +38,6 @@
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 -
47 47  == DASH ==
48 48  
49 49  {{code}}
video_poster.png
Author
... ... @@ -1,1 +1,0 @@
1 -XWiki.AdminAngriff
Size
... ... @@ -1,1 +1,0 @@
1 -82.8 KB
Content
XWiki.WikiMacroClass[0]
Macro code
... ... @@ -15,10 +15,9 @@
15 15   #end
16 16   #if ($videoAttachmentDoc.getAttachment($videoAttachmentName))
17 17   #set ($videoURL = $videoAttachmentDoc.getAttachmentURL($videoAttachmentName))
18 - #set ($videoPosterParam = '')
18 + #set ($videoPoster = '')
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}")
22 22   #end
23 23   #set ($supportedVideoFormats = ['mp4', 'webm', 'ogv', 'mov', 'avi', 'mkv', 'flv'])
24 24   #set ($formatIndex = $videoAttachmentName.lastIndexOf('.'))
... ... @@ -43,8 +43,8 @@
43 43   {{html clean="false"}}
44 44   <div $!embedContainerClass>
45 45   <video class="video-js vjs-default-skin vjs-big-play-centered $!embedItemClass" controls preload="auto"
46 - width="$widthParam" height="$heightParam" $videoPosterParam data-setup=''>
47 - <source src="$escapetool.xml($!videoURL)" type="video/$escapetool.xml($!videoMimeType)" />
45 + width="$widthParam" height="$heightParam" poster="$!videoPoster" data-setup=''>
46 + <source src="$!videoURL" type="video/$!videoMimeType" />
48 48   </video>
49 49   </div>
50 50   {{/html}}
... ... @@ -71,7 +71,7 @@
71 71   {{html clean="false"}}
72 72   <div $!embedContainerClass>
73 73   <video class="dashvideo video-js vjs-default-skin $!embedItemClass" controls preload="auto" width="$widthParam" height="$heightParam">
74 - <source src="$escapetool.xml($!manifestFileURL)" type="application/dash+xml">
73 + <source src="$!manifestFileURL" type="application/dash+xml">
75 75   </video>
76 76   </div>
77 77   {{/html}}
Default categories
... ... @@ -1,1 +1,0 @@
1 -Content