Changes for page APIMacro

Summary

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

Details

XWiki.JavaScriptExtension[0]

Code

...	...	@@ -1,7 +1,7 @@
1	1	require(['jquery'], function($) {
2	2	function onClickHeader() {
3	3	var header = $(this),
4		- content = header.next('.showhidecontent'),
	4	+ content = header.nextAll('.showhidecontent').first(),
5	5	effect = header.attr('data-show-effect'),
6	6	duration = parseInt(header.attr('data-show-duration')) || 300;
7	7
...	...	@@ -12,10 +12,10 @@
12	12	var isVisible = content.is(':visible');
13	13	var newState = !isVisible;
14	14
15		- // Toggle 'open'-Klasse für Rotation
	15	+ // Toggle 'open'-Klasse für Pfeildrehung
16	16	header.toggleClass('open', newState);
17	17
18		- // Ein-/Ausblenden des Inhalts
	18	+ // Zeige/verstecke Inhalt
19	19	content.stop()[effect](duration);
20	20	}
21	21

XWiki.WikiMacroClass[0]

Macro code

...	...	@@ -17,13 +17,7 @@
17	17	#set($effect = "slideToggle")
18	18	#end
19	19	#set($effectduration = $mathtool.mul(1000,$mparams.effectduration))
20		-#set($rawTitle = $mparams.title)
21		-#if($rawTitle && $rawTitle != "")
22		- #set($wikiSyntaxTitle = "= $rawTitle =")
23		- #set($titleRendered = $xwiki.renderText($wikiSyntaxTitle, $doc.syntaxId))
24		-#else
25		- #set($titleRendered = "")
26		-#end
	20	+#set($title = $escapetool.xml($mparams.title))
27	27
28	28	{{html clean=false}}
29	29	<div class="showhide-header"
...	...	@@ -31,17 +31,26 @@
31	31	data-show-duration="$effectduration"
32	32	data-show-effect="$effect">
33	33	<div class="showhide-header-flex">
34		- <div class="showhide-title">$!titleRendered</div>
	28	+ <div class="showhide-title">$title</div>
35	35	<div class="showhide-arrow">&#9654;</div> ## Unicode ▶
36	36	</div>
37	37	</div>
38	38	{{/html}}
39	39
40		-(% class="showhidecontent" #if($id && $id!="")id="showhidecontent${id}" #end#if($xcontext.action != 'edit') style="display: none;"#end %)
41		-(((
42		-(((
43		-{{wikimacrocontent /}}
44		-)))
45		-)))
46		-{{/velocity}}
	34	+#set($language = $mparams.language)
	35	+#if(!$language || $language == "")
	36	+ #set($language = "bash")
	37	+#end
47	47
	39	+#set($codeStart = '{{code language="' + $language + '"}}')
	40	+#set($codeEnd = '{{/code}}')
	41	+#set($content = $codeStart + $wikimacrocontent + $codeEnd)
	42	+
	43	+{{html clean=false}}
	44	+<div class="showhidecontent"
	45	+ #if($id && $id!="") id="showhidecontent${id}" #end
	46	+ #if($xcontext.action != 'edit') style="display: none;" #end>
	47	+ $xwiki.renderText($content, $doc.syntaxId)
	48	+</div>
	49	+{{/html}}
	50	+{{/velocity}}