Changes for page APIMacro

Summary

• Page properties (1 modified, 0 added, 0 removed)
• Objects (3 modified, 0 added, 0 removed)
  • XWiki.JavaScriptExtension[0]
  • 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.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.StyleSheetExtension[0]

Code

...	...	@@ -1,9 +1,10 @@
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		- margin: 30px 0 0;
7	7	cursor: pointer;
8	8	user-select: none;
9	9	}
...	...	@@ -10,6 +10,8 @@
10	10
11	11	.showhidecontent {
12	12	border: 1px solid #ccc;
	14	+ overflow: hidden;
	15	+ margin-bottom: 20px;
13	13	border-top: none;
14	14	border-radius: 0 0 4px 4px;
15	15	padding: 10px;

XWiki.WikiMacroClass[0]

Macro code

...	...	@@ -20,22 +20,31 @@
20	20	#set($title = $escapetool.xml($mparams.title))
21	21
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>
	23	+<div class="showhide-header"
	24	+ #if($id && $id!="") id="showhideheader${id}" #end
	25	+ data-show-duration="$effectduration"
	26	+ data-show-effect="$effect">
	27	+ <div class="showhide-header-flex">
	28	+ <div class="showhide-title">$title</div>
	29	+ <div class="showhide-arrow">&#9654;</div> ## Unicode ▶
32	32	</div>
33		- <div class="showhidecontent"
34		- #if($id && $id != "") id="showhidecontent${id}" #end
35		- #if($xcontext.action != 'edit') style="display: none;" #end>
36		- {{wikimacrocontent /}}
37		- </div>
38	38	</div>
39	39	{{/html}}
40		-{{/velocity}}
41	41
	34	+#set($language = $mparams.language)
	35	+#if(!$language || $language == "")
	36	+ #set($language = "bash")
	37	+#end
	38	+
	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}}