Changes for page Show Hide Macro

Summary

• Page properties (1 modified, 0 added, 0 removed)
• Objects (5 modified, 0 added, 0 removed)
  • XWiki.JavaScriptExtension[0]
  • XWiki.StyleSheetExtension[0]
  • XWiki.WikiMacroClass[0]
  • XWiki.WikiMacroParameterClass[3]
  • XWiki.WikiMacroParameterClass[7]

Details

Page properties

Content

...	...	@@ -3,7 +3,7 @@
3	3	with the same kind of CSS rules. However, it is now based on jQuery, and need requireJS, so it requires
4	4	XWiki 5.x or more.
5	5
6		-{{showhide title="PublicAPI" effect="slide" effectduration="0.5"}}
	6	+{{showhide}}
7	7	Inhalt
8	8	Inhalt
9	9	Inhalt

XWiki.JavaScriptExtension[0]

Code

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

XWiki.StyleSheetExtension[0]

Code

...	...	@@ -1,16 +9,8 @@
1		-.showhide-header {
2		- border: 1px solid #ccc;
3		- background-color: #f7f7f7;
4		- border-radius: 4px 4px 0 0;
5		- padding: 8px 12px;
6		- margin-bottom: 0;
7		-}
8		-
9	9	.showhide-header-flex {
10	10	display: flex;
11	11	justify-content: space-between;
12	12	align-items: center;
13		- padding: 6px 0px;
	5	+ padding: 6px 10px;
14	14	font-weight: bold;
15	15	}
16	16
...	...	@@ -25,19 +25,3 @@
25	25	font-weight: normal;
26	26	}
27	27
28		-.showhidecontent {
29		- border: 1px solid #ccc;
30		- border-top: none;
31		- border-radius: 0 0 4px 4px;
32		- padding: 10px;
33		- background-color: #fff;
34		-}
35		-
36		-.showhide-header:hover {
37		- background-color: #f0f0f0;
38		- cursor: default;
39		-}
40		-
41		-.showhidebutton a:hover {
42		- text-decoration: underline;
43		-}

XWiki.WikiMacroClass[0]

Macro code

...	...	@@ -20,19 +20,24 @@
20	20	#set($title = $escapetool.xml($mparams.title))
21	21	(% #if($divstyle && $divstyle!="") style="${divstyle}" #end %)
22	22	(((
	23	+(% class="showhide-header" %)
	24	+(((
23	23	{{html clean=false}}
24		-<div class="showhide-header"
25		- #if($id && $id!="") id="showhideheader${id}" #end
26		- data-show-duration="$effectduration"
27		- data-show-effect="$effect"
28		- data-show-message="$showmessage"
29		- data-hide-message="$hidemessage">
30		- <div class="showhide-header-flex">
31		- <div class="showhide-title">$title</div>
32		- <div class="showhide-icon">► $showmessage</div>
	26	+<div class="showhide-header-flex">
	27	+ <div class="showhide-title">$title</div>
	28	+ <div class="showhidebutton">
	29	+ <a href="javascript:void(0)"
	30	+ #if($id && $id!="")id="showhidebuttontext${id}" #end
	31	+ data-show-duration="$effectduration"
	32	+ data-show-effect="$effect"
	33	+ data-show-message="$showmessage"
	34	+ data-hide-message="$hidemessage">
	35	+ ► $showmessage
	36	+ </a>
33	33	</div>
34	34	</div>
35	35	{{/html}}
	40	+)))
36	36	(% class="showhidecontent" #if($id && $id!="")id="showhidecontent${id}" #end#if($xcontext.action != 'edit') style="display: none;"#end %)
37	37	(((
38	38	(((

XWiki.WikiMacroParameterClass[3]

Parameter default value

...	...	@@ -1,1 +1,1 @@
1		-slide
	1	+toggle

XWiki.WikiMacroParameterClass[7]

Parameter description

...	...	@@ -1,0 +1,1 @@
	1	+Titel