Changes for page APIMacro

Summary

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

Details

XWiki.WikiMacroClass[0]

Macro code

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