Changes for page APIMacro

Summary

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

Details

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.nextAll('.showhidecontent').first(),
	4	+ content = header.next('.showhidecontent'),
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 Pfeildrehung
	15	+ // Toggle 'open'-Klasse für Rotation
16	16	header.toggleClass('open', newState);
17	17
18		- // Zeige/verstecke Inhalt
	18	+ // Ein-/Ausblenden des Inhalts
19	19	content.stop()[effect](duration);
20	20	}
21	21

XWiki.WikiMacroClass[0]

Macro code

...	...	@@ -5,32 +5,14 @@
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))
21		-
22		-{{html clean=false}}
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 ▶
30		- </div>
31		-</div>
32		-{{/html}}
33		-
34	34	#set($language = $mparams.language)
35	35	#if(!$language || $language == "")
36	36	#set($language = "bash")
...	...	@@ -39,12 +39,22 @@
39	39	#set($codeStart = '{{code language="' + $language + '"}}')
40	40	#set($codeEnd = '{{/code}}')
41	41	#set($content = $codeStart + $wikimacrocontent + $codeEnd)
42		-
43	43	{{html clean=false}}
	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	+ </div>
	33	+</div>
	34	+
44	44	<div class="showhidecontent"
45		- #if($id && $id!="") id="showhidecontent${id}" #end
46		- #if($xcontext.action != 'edit') style="display: none;" #end>
	36	+ id="showhidecontent${id}"
	37	+ style="display: none;">
47	47	$xwiki.renderText($content, $doc.syntaxId)
48	48	</div>
49	49	{{/html}}
50	50	{{/velocity}}
	42	+