Changes for page Show Hide Macro

Summary

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

Details

XWiki.JavaScriptExtension[0]

Code

...	...	@@ -4,23 +4,29 @@
4	4	content = header.next('.showhidecontent'),
5	5	effect = header.attr('data-show-effect'),
6	6	duration = parseInt(header.attr('data-show-duration')) || 300,
	7	+ arrowEl = header.find('.showhide-arrow'),
7	7	iconEl = header.find('.showhide-icon');
8	8
9		- // Sicherheitsprüfung für Effekt
10	10	if ($.inArray(effect, ['toggle', 'fadeToggle', 'slideToggle']) === -1) {
11	11	effect = 'toggle';
12	12	}
13	13
14		- // Sichtbarkeitsstatus
15	15	var isVisible = content.is(':visible');
16	16	var newState = !isVisible;
17	17
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);
	17	+ // Pfeil aktualisieren
	18	+ if (arrowEl.length) {
	19	+ arrowEl.text(newState ? '▼' : '►');
	20	+ }
22	22
23		- // Inhalt ein-/ausblenden
	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	+ }
	29	+
24	24	content.stop()[effect](duration);
25	25	}
26	26

XWiki.WikiMacroClass[0]

Macro code

...	...	@@ -28,9 +28,12 @@
28	28	data-show-message="$showmessage"
29	29	data-hide-message="$hidemessage">
30	30	<div class="showhide-header-flex">
31		- <div class="showhide-title">$title</div>
32		- <div class="showhide-icon">► $showmessage</div>
	31	+ <div class="showhide-title">
	32	+ <span class="showhide-arrow">►</span> $title
	33	+ </div>
	34	+ <div class="showhide-icon">$showmessage</div>
33	33	</div>
	36	+ </div>
34	34	</div>
35	35	{{/html}}
36	36	(% class="showhidecontent" #if($id && $id!="")id="showhidecontent${id}" #end#if($xcontext.action != 'edit') style="display: none;"#end %)