Changes for page Video Macro

Summary

• Objects (3 modified, 0 added, 0 removed)
  • XWiki.JavaScriptExtension[0]
  • XWiki.StyleSheetExtension[0]
  • XWiki.WikiMacroClass[0]

Details

XWiki.JavaScriptExtension[0]

Code

...	...	@@ -46,25 +46,3 @@
46	46	});
47	47	});
48	48	});
49		-
50		-;/*ai-video-facade*/(function(){
51		-function onClick(e){
52		-var el=e.target&&e.target.closest?e.target.closest(".ai-video-facade"):null;
53		-if(!el||el.getAttribute("data-loaded")==="1")return;
54		-var src=el.getAttribute("data-embed-src");
55		-if(!src)return;
56		-el.setAttribute("data-loaded","1");
57		-var sep=src.indexOf("?")===-1?"?":"&";
58		-var iframe=document.createElement("iframe");
59		-iframe.src=src+sep+"autoplay=1";
60		-iframe.setAttribute("frameborder","0");
61		-iframe.setAttribute("allow","accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share");
62		-iframe.setAttribute("referrerpolicy","strict-origin-when-cross-origin");
63		-iframe.setAttribute("allowfullscreen","");
64		-iframe.style.position="absolute";iframe.style.top="0";iframe.style.left="0";iframe.style.width="100%";iframe.style.height="100%";iframe.style.border="0";
65		-el.innerHTML="";
66		-el.appendChild(iframe);
67		-el.style.cursor="default";
68		-}
69		-document.addEventListener("click",onClick);
70		-})();/* /ai-video-facade */

XWiki.StyleSheetExtension[0]

Code

...	...	@@ -9,11 +9,3 @@
9	9	font-weight: normal;
10	10	font-style: normal;
11	11	}
12		-
13		-/* ai-video-facade: Click-to-Load fuer YouTube-Embeds (vermeidet Race Condition beim gleichzeitigen Laden mehrerer iframes) */
14		-.ai-video-facade{position:relative;cursor:pointer;overflow:hidden;background:#000}
15		-.ai-video-facade-thumb{position:absolute;top:0;left:0;width:100%;height:100%;object-fit:cover;display:block}
16		-.ai-video-facade-play{position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);width:68px;height:48px;background:rgba(0,0,0,.75);border-radius:8px;display:flex;align-items:center;justify-content:center;transition:background .15s}
17		-.ai-video-facade:hover .ai-video-facade-play{background:#f00}
18		-.ai-video-facade-play::after{content:'';display:block;width:0;height:0;border-style:solid;border-width:11px 0 11px 19px;border-color:transparent transparent transparent #fff;margin-left:4px}
19		-/* /ai-video-facade */

XWiki.WikiMacroClass[0]

Macro code

...	...	@@ -1,7 +1,6 @@
1	1	{{velocity}}
2	2	## Compute the URL of the embedded video from the original web URL.
3	3	#set ($url = '')
4		-#set ($videoId = '')
5	5	#if ($xcontext.macro.params.url.indexOf('dailymotion') != -1)
6	6	## DailyMotion URLs have the following format:
7	7	## http://www.dailymotion.com/video/<videoId>_<pretty-name>
...	...	@@ -14,7 +14,6 @@
14	14	## which should be transformed into:
15	15	## https://youtube.googleapis.com/v/<videoId>
16	16	#set ($url = $xcontext.macro.params.url.replaceAll('^.*?[&?]v=(.*?)(&.*|$)', '//www.youtube.com/embed/$1'))
17		- #set ($videoId = $xcontext.macro.params.url.replaceAll('^.*?[&?]v=(.*?)(&.*|$)', '$1'))
18	18	#elseif ($xcontext.macro.params.url.indexOf('youtu.be') != -1)
19	19	## YouTube URLs have the following format:
20	20	## http://www.youtube.com/watch?v=<videoId>&otherParams
...	...	@@ -21,7 +21,6 @@
21	21	## which should be transformed into:
22	22	## https://youtube.googleapis.com/v/<videoId>
23	23	#set ($url = $xcontext.macro.params.url.replaceAll('^.*youtu.be/(.*?)(&.*|$)', '//www.youtube.com/embed/$1'))
24		- #set ($videoId = $xcontext.macro.params.url.replaceAll('^.*youtu.be/(.*?)(&.*|$)', '$1'))
25	25	#elseif ($xcontext.macro.params.url.indexOf('google') != -1)
26	26	## Google Video URLs have the following format:
27	27	## http://video.google.com/videoplay?docid=<videoId>
...	...	@@ -50,24 +50,10 @@
50	50	#end
51	51	#set ($width = "width=$width")
52	52	#set ($height = "height=$height")
53		-#set ($styleW = $width.replaceFirst('^width=', ''))
54		-#set ($styleH = $height.replaceFirst('^height=', ''))
55	55	{{/velocity}}
56	56
57		-{{velocity}}#if ("$!videoId" != '')
58		- ## Click-to-Load Facade (vermeidet Race Condition beim gleichzeitigen
59		- ## Laden mehrerer YouTube-iframes -- siehe patch_video_macro_facade.ps1)
60		- #set ($discard = $xwiki.jsx.use('Macros.Video20'))
61		- #set ($discard = $xwiki.ssx.use('Macros.Video20'))
62		- #set ($thumbUrl = "https://i.ytimg.com/vi/${videoId}/hqdefault.jpg")
	52	+{{velocity}}#if ("$!url" != '')
63	63	{{html clean="false"}}
64		- <div$!{embedContainerClass} class="ai-video-facade $!embedItemClass" data-embed-src="$!escapetool.xml($url)" style="width:$!styleW;height:$!styleH">
65		- <img class="ai-video-facade-thumb" src="$!escapetool.xml($thumbUrl)" alt="" loading="lazy"/>
66		- <div class="ai-video-facade-play" aria-hidden="true"></div>
67		- </div>
68		- {{/html}}
69		-#elseif ("$!url" != '')
70		- {{html clean="false"}}
71	71	<div$!{embedContainerClass}>
72	72	#if ($xcontext.macro.params.url.indexOf('google') != -1)
73	73	<object class="$!embedItemClass" $!width $!height type="application/x-shockwave-flash" data="$!url">
...	...	@@ -75,7 +75,7 @@
75	75	<param name="allowFullScreen" value="true"></param>
76	76	</object>
77	77	#else
78		- <iframe class="$!embedItemClass" src="$!url" $!width $!height frameborder="0" loading="lazy" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" referrerpolicy="strict-origin-when-cross-origin" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
	61	+ <iframe class="$!embedItemClass" src="$!url" $!width $!height frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
79	79	#end
80	80	</div>
81	81	{{/html}}