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,26 +1,31 @@
1	1	require(['jquery'], function($) {
2		- function onClick () {
3		- var button = $(this),
4		- content = button.closest('.showhide-header').next('.showhidecontent'),
5		- effect = button.attr('data-show-effect'),
6		- data = button.data();
	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	+ iconEl = header.find('.showhide-icon');
7	7
8		- if ($.inArray(effect, ['toggle', 'fadeToggle', 'slideToggle']) == -1)
	9	+ // Sicherheitsprüfung für Effekt
	10	+ if ($.inArray(effect, ['toggle', 'fadeToggle', 'slideToggle']) === -1) {
9	9	effect = 'toggle';
	12	+ }
10	10
11		- data.showHideState = !(('showHideState' in data) ? data.showHideState : content.is(':visible'));
	14	+ // Sichtbarkeitsstatus
	15	+ var isVisible = content.is(':visible');
	16	+ var newState = !isVisible;
12	12
13		- var message = button.attr(data.showHideState ? 'data-hide-message' : 'data-show-message');
14		- var icon = data.showHideState ? '▼ ' : '► ';
15		- button.html(icon + message);
	18	+ // Nachricht + Pfeil setzen
	19	+ var message = newState ? header.attr('data-hide-message') : header.attr('data-show-message');
	20	+ var icon = newState ? '▼ ' : '► ';
	21	+ iconEl.html(icon + message);
16	16
17		- content.stop()[effect](parseInt(button.attr('data-show-duration')));
18		-
19		- return false;
	23	+ // Inhalt ein-/ausblenden
	24	+ content.stop()[effect](duration);
20	20	}
21	21
22		- $(document).ready(function() {
23		- $('.showhidebutton').children('a').on('click', onClick);
	27	+ $(document).ready(function () {
	28	+ $('.showhide-header').on('click', onClickHeader);
24	24	});
25	25	});
26	26

XWiki.StyleSheetExtension[0]

Code

...	...	@@ -32,3 +32,12 @@
32	32	padding: 10px;
33	33	background-color: #fff;
34	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,24 +20,19 @@
20	20	#set($title = $escapetool.xml($mparams.title))
21	21	(% #if($divstyle && $divstyle!="") style="${divstyle}" #end %)
22	22	(((
23		-(% class="showhide-header" %)
24		-(((
25	25	{{html clean=false}}
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>
	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>
37	37	</div>
38	38	</div>
39	39	{{/html}}
40		-)))
41	41	(% class="showhidecontent" #if($id && $id!="")id="showhidecontent${id}" #end#if($xcontext.action != 'edit') style="display: none;"#end %)
42	42	(((
43	43	(((