Changes for page Show Hide Macro

Summary

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

Details

XWiki.JavaScriptExtension[0]

Code

...	...	@@ -1,22 +1,24 @@
1	1	require(['jquery'], function($) {
2	2	function onClick () {
3	3	var button = $(this),
4		- content = button.parent().next(),
5		- effect = button.attr('data-show-effect'),
6		- data = button.data();
	4	+ content = button.parent().next(),
	5	+ effect = button.attr('data-show-effect'),
	6	+ data = button.data();
7	7
8	8	if ($.inArray(effect, ['toggle', 'fadeToggle', 'slideToggle']) == -1)
9	9	effect = 'toggle';
10	10
11		- // Toggle-Zustand berechnen
	11	+ // Determine current visibility and toggle state
12	12	data.showHideState = !(('showHideState' in data) ? data.showHideState : content.is(':visible'));
13	13
14		- // Pfeil und Text setzen
	14	+ // Determine message and icon
15	15	var message = button.attr(data.showHideState ? 'data-hide-message' : 'data-show-message');
16	16	var icon = data.showHideState ? '▼ ' : '► ';
	17	+
	18	+ // Update button text with icon
17	17	button.html(icon + message);
18	18
19		- // Inhalt ein-/ausblenden
	21	+ // Perform the animation
20	20	content.stop()[effect](parseInt(button.attr('data-show-duration')));
21	21
22	22	return false;

XWiki.StyleSheetExtension[0]

Code

...	...	@@ -2,7 +2,10 @@
2	2	display: flex;
3	3	justify-content: space-between;
4	4	align-items: center;
	5	+ background-color: #f9f9f9;
5	5	padding: 6px 10px;
	7	+ border: 1px solid #ddd;
	8	+ border-radius: 4px 4px 0 0;
6	6	font-weight: bold;
7	7	}
8	8

Content Type

...	...	@@ -1,1 +1,0 @@
1		-CSS

Name

...	...	@@ -1,1 +1,1 @@
1		-ShowHideMacro Style
	1	+ShowHide Style

Parse content

...	...	@@ -1,1 +1,0 @@
1		-No

Use this extension

...	...	@@ -1,1 +1,0 @@
1		-currentPage

XWiki.WikiMacroClass[0]

Macro code

...	...	@@ -11,6 +11,17 @@
11	11	#set($hidemessage = $escapetool.xml($mparams.hidemessage))
12	12	#set($divstyle = $escapetool.xml($mparams.style))
13	13	#set($effect = $escapetool.xml($mparams.effect))
	14	+#set($title = $escapetool.xml($mparams.title))
	15	+
	16	+## Standardtexte setzen
	17	+#if(!$showmessage || $showmessage == "")
	18	+ #set($showmessage = "Anzeigen")
	19	+#end
	20	+#if(!$hidemessage || $hidemessage == "")
	21	+ #set($hidemessage = "Verbergen")
	22	+#end
	23	+
	24	+## Effekte setzen
14	14	#if($effect == "appear" || $effect == "fade")
15	15	#set($effect = "fadeToggle")
16	16	#elseif ($effect == "blind" || $effect == "slide")
...	...	@@ -17,9 +17,11 @@
17	17	#set($effect = "slideToggle")
18	18	#end
19	19	#set($effectduration = $mathtool.mul(1000,$mparams.effectduration))
20		-#set($title = $escapetool.xml($mparams.title))
	31	+
	32	+## HTML-Struktur
21	21	(% #if($divstyle && $divstyle!="") style="${divstyle}" #end %)
22	22	(((
	35	+
23	23	(% class="showhide-header" %)
24	24	(((
25	25	{{html clean=false}}
...	...	@@ -38,11 +38,14 @@
38	38	</div>
39	39	{{/html}}
40	40	)))
	54	+
41	41	(% class="showhidecontent" #if($id && $id!="")id="showhidecontent${id}" #end#if($xcontext.action != 'edit') style="display: none;"#end %)
42		-(((
43		-(((
	56	+(((
	57	+(((
44	44	{{wikimacrocontent /}}
	59	+)))
45	45	)))
	61	+
46	46	)))
47		-)))
48	48	{{/velocity}}
	64	+