... |
... |
@@ -1,10 +1,10 @@ |
1 |
1 |
{{velocity output="false"}} |
2 |
2 |
$xwiki.ssx.use('IconThemesCode.IconPicker') |
3 |
|
- ## The icons themes may need some SSX, so we ask to load the resources of all icon sets to be able to display them |
4 |
|
- ## in the picker. |
|
3 |
+ ## The icons themes may need some SSX, so we ask for a rendering of an icon of each icon theme, to be able to display |
|
4 |
+ ## all icon themes in the picker |
5 |
5 |
## ToDo: since it is a bit hacky, a better system would be to dynamically load the needed SSX on demand |
6 |
6 |
#foreach($iconSetName in $services.icon.iconSetNames) |
7 |
|
- $services.icon.use($iconSetName) |
|
7 |
+ $services.icon.render('wiki', $iconSetName) |
8 |
8 |
#end |
9 |
9 |
{{/velocity}} |
10 |
10 |
|
... |
... |
@@ -19,13 +19,13 @@ |
19 |
19 |
require(['jquery', 'xwiki-icon-picker'], function($) { |
20 |
20 |
var options = {}; |
21 |
21 |
#if($xcontext.macro.params.parameterNames.contains('prefix')) |
22 |
|
- options['prefix'] = $jsontool.serialize($xcontext.macro.params.prefix); |
|
22 |
+ options['prefix'] = '$escapetool.javascript($xcontext.macro.params.prefix)'; |
23 |
23 |
#end |
24 |
24 |
#if("$!xcontext.macro.params.id" != '') |
25 |
|
- $($jsontool.serialize("#$escapetool.css($xcontext.macro.params.id)")).xwikiIconPicker(options); |
|
25 |
+ $('#${xcontext.macro.params.id}').xwikiIconPicker(options); |
26 |
26 |
#end |
27 |
27 |
#if("$!xcontext.macro.params.get('class')" != '') |
28 |
|
- $($jsontool.serialize(".$escapetool.css($xcontext.macro.params.get('class'))")).xwikiIconPicker(options); |
|
28 |
+ $('.${xcontext.macro.params.get('class')}').xwikiIconPicker(options); |
29 |
29 |
#end |
30 |
30 |
}); |
31 |
31 |
</script> |