| ... |
... |
@@ -4,47 +4,39 @@ |
| 4 |
4 |
#if(!$mparams) |
| 5 |
5 |
#set($mparams = $xcontext.macro.params) |
| 6 |
6 |
#end |
| 7 |
|
-#if($mparams.id) |
| 8 |
|
- #set($id = $util.convertToAlphaNumeric($mparams.id)) |
| 9 |
|
-#end |
| 10 |
|
-#set($showmessage = $escapetool.xml($mparams.showmessage)) |
| 11 |
|
-#set($hidemessage = $escapetool.xml($mparams.hidemessage)) |
| 12 |
|
-#set($divstyle = $escapetool.xml($mparams.style)) |
| 13 |
|
-#set($effect = $escapetool.xml($mparams.effect)) |
|
7 |
+ |
|
8 |
+#set($id = $util.convertToAlphaNumeric($mparams.id)) |
|
9 |
+#set($effect = $mparams.effect) |
| 14 |
14 |
#if($effect == "appear" || $effect == "fade") |
| 15 |
15 |
#set($effect = "fadeToggle") |
| 16 |
|
-#elseif ($effect == "blind" || $effect == "slide") |
|
12 |
+#elseif($effect == "blind" || $effect == "slide") |
| 17 |
17 |
#set($effect = "slideToggle") |
| 18 |
18 |
#end |
| 19 |
19 |
#set($effectduration = $mathtool.mul(1000,$mparams.effectduration)) |
| 20 |
|
-#set($title = $escapetool.xml($mparams.title)) |
| 21 |
|
-(% #if($divstyle && $divstyle!="") style="${divstyle}" #end %) |
| 22 |
|
-((( |
|
16 |
+#set($language = $mparams.language) |
|
17 |
+#if(!$language || $language == "") |
|
18 |
+ #set($language = "bash") |
|
19 |
+#end |
|
20 |
+ |
|
21 |
+#set($codeStart = '{{code language="' + $language + '"}}') |
|
22 |
+#set($codeEnd = '{{/code}}') |
|
23 |
+#set($content = $codeStart + $wikimacrocontent + $codeEnd) |
| 23 |
23 |
{{html clean=false}} |
| 24 |
24 |
<div class="showhide-header" |
| 25 |
|
- #if($id && $id!="") id="showhideheader${id}" #end |
| 26 |
|
- data-show-duration="$effectduration" |
| 27 |
|
- data-show-effect="$effect"> |
|
26 |
+ id="showhideheader${id}" |
|
27 |
+ data-show-effect="$effect" |
|
28 |
+ data-show-duration="$effectduration"> |
| 28 |
28 |
<div class="showhide-header-flex"> |
| 29 |
|
- <div class="showhide-title">$title</div> |
| 30 |
|
- <div class="showhide-arrow">▶</div> ## Unicode ▶ |
|
30 |
+ <div class="showhide-title">$mparams.title</div> |
|
31 |
+ <div class="showhide-arrow">▶</div> |
| 31 |
31 |
</div> |
| 32 |
32 |
</div> |
| 33 |
|
-{{/html}} |
| 34 |
|
-#set($codeLang = "text") |
| 35 |
|
-#if($mparams.language && $mparams.language != "") |
| 36 |
|
- #set($codeLang = $escapetool.xml($mparams.language)) |
| 37 |
|
-#end |
| 38 |
38 |
|
| 39 |
|
-(% class="showhidecontent" |
| 40 |
|
- #if($id && $id!="")id="showhidecontent${id}" #end |
| 41 |
|
- #if($xcontext.action != 'edit') style="display: none;" #end |
| 42 |
|
-%) |
| 43 |
|
-((( |
| 44 |
|
-{{html clean="false"}} |
| 45 |
|
-{{code language="$codeLang"}}#evaluate($wikimacrocontent){{/code}} |
|
35 |
+<div class="showhidecontent" |
|
36 |
+ id="showhidecontent${id}" |
|
37 |
+ style="display: none;"> |
|
38 |
+ $xwiki.renderText($content, $doc.syntaxId) |
|
39 |
+</div> |
| 46 |
46 |
{{/html}} |
| 47 |
|
-))) |
| 48 |
|
- |
| 49 |
|
-))) |
| 50 |
50 |
{{/velocity}} |
|
42 |
+ |
