Changes for page APIMacro

Summary

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

Details

Page properties

Content

...	...	@@ -1,5 +3,3 @@
1		-{{aagon.floatingbox/}}
2		-
3	3	{{apimacro title="Text"}}
4	4	Text
5	5	Text
...	...	@@ -6,10 +6,30 @@
6	6	Text
7	7	{{/apimacro}}
8	8
9		-{{apimacro title="Code"}}
	7	+(% class="showhide-header" data-show-duration="$effectduration" data-show-effect="$effect" %)
	8	+(((
	9	+(% class="showhide-header-flex" %)
	10	+(((
	11	+(% class="showhide-title" %)
	12	+(((
10	10	Code
11		-{{/apimacro}}
	14	+)))
12	12
13		-{{apimacro title="APIMacro"}}
	16	+(% class="showhide-arrow" %)
	17	+(((
	18	+▶
	19	+)))
	20	+)))
	21	+)))
	22	+
	23	+(% class="showhidecontent" style="display: none;" %)
	24	+(((
	25	+(((
	26	+Code
	27	+Code
	28	+Code
	29	+)))
	30	+)))
	31	+
	32	+
14	14
15		-{{/apimacro}}

XWiki.JavaScriptExtension[0]

Code

...	...	@@ -1,7 +1,7 @@
1	1	require(['jquery'], function($) {
2	2	function onClickHeader() {
3	3	var header = $(this),
4		- content = header.nextAll('.showhidecontent').first(),
	4	+ content = header.next('.showhidecontent'),
5	5	effect = header.attr('data-show-effect'),
6	6	duration = parseInt(header.attr('data-show-duration')) || 300;
7	7
...	...	@@ -12,10 +12,10 @@
12	12	var isVisible = content.is(':visible');
13	13	var newState = !isVisible;
14	14
15		- // Toggle 'open'-Klasse für Pfeildrehung
	15	+ // Toggle 'open'-Klasse für Rotation
16	16	header.toggleClass('open', newState);
17	17
18		- // Zeige/verstecke Inhalt
	18	+ // Ein-/Ausblenden des Inhalts
19	19	content.stop()[effect](duration);
20	20	}
21	21

XWiki.StyleSheetExtension[0]

Code

...	...	@@ -1,9 +1,12 @@
1		-.showhide-header {
	1	+.showhide-wrapper {
	2	+ margin: 6px 0 20px;
2	2	overflow: hidden;
	4	+}
	5	+
	6	+.showhide-header {
3	3	border: 1px solid #ccc;
4	4	background-color: #f7f7f7;
5	5	border-radius: 4px 4px 0 0;
6		- margin: 6px 0 0;
7	7	padding: 10px 12px;
8	8	cursor: pointer;
9	9	user-select: none;
...	...	@@ -11,8 +11,6 @@
11	11
12	12	.showhidecontent {
13	13	border: 1px solid #ccc;
14		- overflow: hidden;
15		- margin-bottom: 20px;
16	16	border-top: none;
17	17	border-radius: 0 0 4px 4px;
18	18	padding: 10px;

XWiki.WikiMacroClass[0]

Macro code

...	...	@@ -31,20 +31,11 @@
31	31	</div>
32	32	{{/html}}
33	33
34		-#set($language = $mparams.language)
35		-#if(!$language || $language == "")
36		- #set($language = "bash")
37		-#end
38		-
39		-#set($codeStart = '{{code language="' + $language + '"}}')
40		-#set($codeEnd = '{{/code}}')
41		-#set($content = $codeStart + $wikimacrocontent + $codeEnd)
42		-
43		-{{html clean=false}}
44		-<div class="showhidecontent"
45		- #if($id && $id!="") id="showhidecontent${id}" #end
46		- #if($xcontext.action != 'edit') style="display: none;" #end>
47		- $xwiki.renderText($content, $doc.syntaxId)
48		-</div>
49		-{{/html}}
	34	+(% class="showhidecontent" #if($id && $id!="")id="showhidecontent${id}" #end#if($xcontext.action != 'edit') style="display: none;"#end %)
	35	+(((
	36	+(((
	37	+{{wikimacrocontent /}}
	38	+)))
	39	+)))
50	50	{{/velocity}}
	41	+