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,12 +6,9 @@
1		-.showhide-wrapper {
2		- margin: 6px 0 20px;
3		- overflow: hidden;
4		-}
5		-
6	6	.showhide-header {
	2	+ overflow: hidden;
7	7	border: 1px solid #ccc;
8	8	background-color: #f7f7f7;
9	9	border-radius: 4px 4px 0 0;
	6	+ margin: 6px 0 0;
10	10	padding: 10px 12px;
11	11	cursor: pointer;
12	12	user-select: none;
...	...	@@ -14,6 +14,8 @@
14	14
15	15	.showhidecontent {
16	16	border: 1px solid #ccc;
	14	+ overflow: hidden;
	15	+ margin-bottom: 20px;
17	17	border-top: none;
18	18	border-radius: 0 0 4px 4px;
19	19	padding: 10px;

XWiki.WikiMacroClass[0]

Macro code

...	...	@@ -5,38 +5,38 @@
5	5	#set($mparams = $xcontext.macro.params)
6	6	#end
7	7
8		-## Parameter vorbereiten
9		-#if($mparams.id)
10		- #set($id = $util.convertToAlphaNumeric($mparams.id))
11		-#end
12		-#set($divstyle = $escapetool.xml($mparams.style))
13		-#set($effect = $escapetool.xml($mparams.effect))
	8	+#set($id = $util.convertToAlphaNumeric($mparams.id))
	9	+#set($effect = $mparams.effect)
14	14	#if($effect == "appear" || $effect == "fade")
15	15	#set($effect = "fadeToggle")
16		-#elseif ($effect == "blind" || $effect == "slide")
	12	+#elseif($effect == "blind" || $effect == "slide")
17	17	#set($effect = "slideToggle")
18	18	#end
19	19	#set($effectduration = $mathtool.mul(1000,$mparams.effectduration))
20		-#set($title = $escapetool.xml($mparams.title))
	16	+#set($language = $mparams.language)
	17	+#if(!$language || $language == "")
	18	+ #set($language = "bash")
	19	+#end
21	21
	21	+#set($codeStart = '{{code language="' + $language + '"}}')
	22	+#set($codeEnd = '{{/code}}')
	23	+#set($content = $codeStart + $wikimacrocontent + $codeEnd)
22	22	{{html clean=false}}
23		-<div class="showhide-wrapper" #if($divstyle && $divstyle != "") style="$divstyle" #end>
24		- <div class="showhide-header"
25		- #if($id && $id != "") id="showhideheader${id}" #end
26		- data-show-duration="$effectduration"
27		- data-show-effect="$effect">
28		- <div class="showhide-header-flex">
29		- <div class="showhide-title">$title</div>
30		- <div class="showhide-arrow">&#9654;</div>
31		- </div>
	25	+<div class="showhide-header"
	26	+ id="showhideheader${id}"
	27	+ data-show-effect="$effect"
	28	+ data-show-duration="$effectduration">
	29	+ <div class="showhide-header-flex">
	30	+ <div class="showhide-title">$mparams.title</div>
	31	+ <div class="showhide-arrow">&#9654;</div>
32	32	</div>
33		-{{/html}}
	33	+</div>
34	34
35		-(% class="showhidecontent" #if($id && $id!="")id="showhidecontent${id}" #end#if($xcontext.action != 'edit') style="display: none;"#end %)
36		-(((
37		-(((
38		-{{wikimacrocontent /}}
39		-)))
40		-)))
	35	+<div class="showhidecontent"
	36	+ id="showhidecontent${id}"
	37	+ style="display: none;">
	38	+ $xwiki.renderText($content, $doc.syntaxId)
	39	+</div>
	40	+{{/html}}
41	41	{{/velocity}}
42	42