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,13 +3,10 @@
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"}}
7		-{{code language="PowerShell"}}
8		-Hier steht neuer Code
9		-Code
10		-Code
11		-Code
12		-{{/code}}
	6	+{{showhide}}
	7	+Inhalt
	8	+Inhalt
	9	+Inhalt
13	13	{{/showhide}}
14	14
15	15	{{info}}

XWiki.JavaScriptExtension[0]

Code

...	...	@@ -1,37 +1,29 @@
1	1	require(['jquery'], function($) {
2		- function onClickHeader() {
3		- var header = $(this),
4		- content = header.next('.showhidecontent'),
5		- effect = header.attr('data-show-effect'),
6		- duration = parseInt(header.attr('data-show-duration')) || 300,
7		- arrowEl = header.find('.showhide-arrow'),
8		- iconEl = header.find('.showhide-icon');
	2	+ function onClick () {
	3	+ var button = $(this),
	4	+ content = button.parent().next(),
	5	+ effect = button.attr('data-show-effect'),
	6	+ data = button.data();
9	9
10		- if ($.inArray(effect, ['toggle', 'fadeToggle', 'slideToggle']) === -1) {
	8	+ if ($.inArray(effect, ['toggle', 'fadeToggle', 'slideToggle']) == -1)
11	11	effect = 'toggle';
12		- }
13	13
14		- var isVisible = content.is(':visible');
15		- var newState = !isVisible;
	11	+ // Toggle-Zustand berechnen
	12	+ data.showHideState = !(('showHideState' in data) ? data.showHideState : content.is(':visible'));
16	16
17		- // Pfeil aktualisieren
18		- if (arrowEl.length) {
19		- arrowEl.text(newState ? '▼' : '►');
20		- }
	14	+ // Pfeil und Text setzen
	15	+ var message = button.attr(data.showHideState ? 'data-hide-message' : 'data-show-message');
	16	+ var icon = data.showHideState ? '▼ ' : '► ';
	17	+ button.html(icon + message);
21	21
22		- // Nachricht rechts aktualisieren (optional)
23		- if (iconEl.length) {
24		- var message = newState
25		- ? header.attr('data-hide-message')
26		- : header.attr('data-show-message');
27		- iconEl.text(message);
28		- }
	19	+ // Inhalt ein-/ausblenden
	20	+ content.stop()[effect](parseInt(button.attr('data-show-duration')));
29	29
30		- content.stop()[effect](duration);
	22	+ return false;
31	31	}
32	32
33		- $(document).ready(function () {
34		- $('.showhide-header').on('click', onClickHeader);
	25	+ $(document).ready(function() {
	26	+ $('.showhidebutton').children('a').on('click', onClick);
35	35	});
36	36	});
37	37

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,30 +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		-}
44		-
45		-.showhide-icon {
46		- color: #0645ad; /* typisches Link-Blau */
47		- text-decoration: underline;
48		- cursor: pointer;
49		-}
50		-
51		-.showhide-header:hover .showhide-icon {
52		- text-decoration: underline;
53		- color: #0b0080; /* dunkler beim Hover */
54		-}

Use this extension

...	...	@@ -1,1 +1,1 @@
1		-always
	1	+currentPage

XWiki.WikiMacroClass[0]

Macro code

...	...	@@ -20,22 +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">
32		- <span class="showhide-arrow">►</span> $title
33		- </div>
34		- <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>
35	35	</div>
36		- </div>
37	37	</div>
38	38	{{/html}}
	40	+)))
39	39	(% class="showhidecontent" #if($id && $id!="")id="showhidecontent${id}" #end#if($xcontext.action != 'edit') style="display: none;"#end %)
40	40	(((
41	41	(((

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

Parameter mandatory

...	...	@@ -1,1 +1,1 @@
1		-No
	1	+Yes