Changes for page APIMacro

Summary

• Page properties (1 modified, 0 added, 0 removed)
• Objects (2 modified, 0 added, 0 removed)
  • XWiki.StyleSheetExtension[0]
  • XWiki.WikiMacroClass[0]

Details

Page properties

Content

...	...	@@ -1,7 +1,15 @@
1		-{{apimacro title="APIMacro"}}
2		-Code
	1	+{{aagon.floatingbox/}}
3	3
4		-Code
	3	+{{apimacro title="Text"}}
	4	+Text
	5	+Text
	6	+Text
	7	+{{/apimacro}}
5	5
	9	+{{apimacro title="Code"}}
6	6	Code
7	7	{{/apimacro}}
	12	+
	13	+{{apimacro title="APIMacro"}}
	14	+
	15	+{{/apimacro}}

XWiki.StyleSheetExtension[0]

Code

...	...	@@ -1,7 +1,9 @@
1	1	.showhide-header {
	2	+ overflow: hidden;
2	2	border: 1px solid #ccc;
3	3	background-color: #f7f7f7;
4	4	border-radius: 4px 4px 0 0;
	6	+ margin: 6px 0 0;
5	5	padding: 10px 12px;
6	6	cursor: pointer;
7	7	user-select: none;
...	...	@@ -9,6 +9,8 @@
9	9
10	10	.showhidecontent {
11	11	border: 1px solid #ccc;
	14	+ overflow: hidden;
	15	+ margin-bottom: 20px;
12	12	border-top: none;
13	13	border-radius: 0 0 4px 4px;
14	14	padding: 10px;

XWiki.WikiMacroClass[0]

Macro code

...	...	@@ -4,11 +4,11 @@
4	4	#if(!$mparams)
5	5	#set($mparams = $xcontext.macro.params)
6	6	#end
	7	+
	8	+## Parameter vorbereiten
7	7	#if($mparams.id)
8	8	#set($id = $util.convertToAlphaNumeric($mparams.id))
9	9	#end
10		-#set($showmessage = $escapetool.xml($mparams.showmessage))
11		-#set($hidemessage = $escapetool.xml($mparams.hidemessage))
12	12	#set($divstyle = $escapetool.xml($mparams.style))
13	13	#set($effect = $escapetool.xml($mparams.effect))
14	14	#if($effect == "appear" || $effect == "fade")
...	...	@@ -17,9 +17,13 @@
17	17	#set($effect = "slideToggle")
18	18	#end
19	19	#set($effectduration = $mathtool.mul(1000,$mparams.effectduration))
20		-#set($title = $escapetool.xml($mparams.title))
21		-(% #if($divstyle && $divstyle!="") style="${divstyle}" #end %)
22		-(((
	20	+
	21	+## Titel vorbereiten als Wiki-Syntax und gerendert
	22	+#set($rawTitle = $mparams.title)
	23	+#if($rawTitle && $rawTitle != "")
	24	+ #set($wikiSyntaxTitle = "= $rawTitle =")
	25	+#end
	26	+
23	23	{{html clean=false}}
24	24	<div class="showhide-header"
25	25	#if($id && $id!="") id="showhideheader${id}" #end
...	...	@@ -26,25 +26,19 @@
26	26	data-show-duration="$effectduration"
27	27	data-show-effect="$effect">
28	28	<div class="showhide-header-flex">
29		- <div class="showhide-title">$title</div>
	33	+ <div class="showhide-title">
	34	+ #evaluate($wikiSyntaxTitle)
	35	+ </div>
30	30	<div class="showhide-arrow">&#9654;</div> ## Unicode ▶
31	31	</div>
32	32	</div>
33	33	{{/html}}
34		-#set($codeLang = "text")
35		-#if($mparams.language && $mparams.language != "")
36		- #set($codeLang = $escapetool.xml($mparams.language))
37		-#end
38	38
39		-(% class="showhidecontent"
40		- #if($id && $id!="")id="showhidecontent${id}" #end
41		- #if($xcontext.action != 'edit') style="display: none;" #end
42		-%)
	41	+(% class="showhidecontent" #if($id && $id!="")id="showhidecontent${id}" #end#if($xcontext.action != 'edit') style="display: none;"#end %)
43	43	(((
44		-{{html clean="false"}}
45		-{{code language="$codeLang"}}#evaluate($wikimacrocontent){{/code}}
46		-{{/html}}
	43	+(((
	44	+{{wikimacrocontent /}}
	45	+)))
47	47	)))
48		-
49		-)))
50	50	{{/velocity}}
	48	+