Changes for page APIMacro

Summary

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

Details

XWiki.WikiMacroClass[0]

Macro code

...	...	@@ -5,6 +5,7 @@
5	5	#set($mparams = $xcontext.macro.params)
6	6	#end
7	7
	8	+## Parameter vorbereiten
8	8	#if($mparams.id)
9	9	#set($id = $util.convertToAlphaNumeric($mparams.id))
10	10	#end
...	...	@@ -16,12 +16,8 @@
16	16	#set($effect = "slideToggle")
17	17	#end
18	18	#set($effectduration = $mathtool.mul(1000,$mparams.effectduration))
	20	+#set($title = $escapetool.xml($mparams.title))
19	19
20		-#set($title = $mparams.title)
21		-
22		-## XWiki-Syntax direkt ausgeben
23		-= $title =
24		-
25	25	{{html clean=false}}
26	26	<div class="showhide-header"
27	27	#if($id && $id!="") id="showhideheader${id}" #end
...	...	@@ -28,19 +28,26 @@
28	28	data-show-duration="$effectduration"
29	29	data-show-effect="$effect">
30	30	<div class="showhide-header-flex">
31		- <div class="showhide-arrow">&#9654;</div>
	28	+ <div class="showhide-title">$title</div>
	29	+ <div class="showhide-arrow">&#9654;</div> ## Unicode ▶
32	32	</div>
33	33	</div>
34	34	{{/html}}
35	35
36		-(% class="showhidecontent"
37		- #if($id && $id!="") id="showhidecontent${id}" #end
38		- #if($xcontext.action != 'edit') style="display: none;" #end
39		-%)
40		-(((
41		-(((
42		-{{wikimacrocontent /}}
43		-)))
44		-)))
45		-{{/velocity}}
	34	+#set($language = $mparams.language)
	35	+#if(!$language || $language == "")
	36	+ #set($language = "bash")
	37	+#end
46	46
	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}}