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,3 +1,5 @@
	1	+{{aagon.floatingbox/}}
	2	+
1	1	{{apimacro title="Text"}}
2	2	Text
3	3	Text
...	...	@@ -6,10 +6,8 @@
6	6
7	7	{{apimacro title="Code"}}
8	8	Code
9		-Code
10		-Code
11	11	{{/apimacro}}
12	12
13		-
14		-
	13	+{{apimacro title="APIMacro"}}
15	15
	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,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

...	...	@@ -31,11 +31,20 @@
31	31	</div>
32	32	{{/html}}
33	33
34		-(% class="showhidecontent" #if($id && $id!="")id="showhidecontent${id}" #end#if($xcontext.action != 'edit') style="display: none;"#end %)
35		-(((
36		-(((
37		-{{wikimacrocontent /}}
38		-)))
39		-)))
40		-{{/velocity}}
	34	+#set($language = $mparams.language)
	35	+#if(!$language || $language == "")
	36	+ #set($language = "bash")
	37	+#end
41	41
	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}}