Änderungen von Dokument MentionsMacro

Zusammenfassung

• Objekte (2 geändert, 1 hinzugefügt, 0 gelöscht)
  • XWiki.JavaScriptExtension[0]
  • XWiki.WikiMacroClass[0]
  • XWiki.WikiMacroParameterClass[3]

Details

XWiki.JavaScriptExtension[0]

Code

...	...	@@ -1,7 +1,6 @@
1	1	require.config({
2	2	paths: {
3		- 'xwiki-suggestUsers': "$xwiki.getSkinFile('uicomponents/suggest/suggestUsersAndGroups.js', true))" +
4		- "?v=$escapetool.url($xwiki.version)"
	3	+ 'xwiki-suggestUsers': $jsontool.serialize($xwiki.getSkinFile('uicomponents/suggest/suggestUsersAndGroups.js', true))
5	5	}
6	6	});
7	7	require(['deferred!ckeditor', 'xwiki-suggestUsers', 'jquery', 'xwiki-meta'], function (ckeditorPromise, suggestUsers, $, xm) {
...	...	@@ -83,7 +83,7 @@
83	83	editor.once('afterInsertHtml', function () {
84	84	editor.execCommand('xwiki-macro-insert', {
85	85	name: 'mention',
86		- inline: true,
	85	+ inline: 'enforce',
87	87	parameters: {
88	88	reference: param.id,
89	89	style: 'FULL_NAME',
...	...	@@ -99,7 +99,7 @@
99	99	}
100	100
101	101	function updateConf(config, name) {
102		- const newConf = config;
	101	+ const newConf = config || {};
103	103	newConf.mentions = newConf.mentions || [];
104	104	newConf.mentions.push(confMentions(name));
105	105	return newConf;

XWiki.WikiMacroClass[0]

Makro-Code

...	...	@@ -1,9 +1,10 @@
1	1	{{velocity}}
2	2	#set ($reference = $wikimacro.parameters.reference)
3	3	#set ($style = $wikimacro.parameters.style)
4		-#set ($content = $services.mentions.format($reference.reference, $style))
	4	+#set ($type = "$!wikimacro.parameters.type")
	5	+#set ($content = $services.mentions.format($reference.reference, $style, $type))
5	5	#set ($anchor = $wikimacro.parameters.anchor)
6		-#set ($isCurrentUser = $xcontext.userReference == $reference.reference)
	7	+#set ($isCurrentUser = $xcontext.userReference == $reference.reference && ($type == '' || $type == 'user'))
7	7	#set ($cssClasses = ['xwiki-mention', 'user'])
8	8	#if ($isCurrentUser)
9	9	#set ($discard = $cssClasses.add('self'))
...	...	@@ -10,6 +10,8 @@
10	10	#end
11	11	#set ($link = $xwiki.getURL($reference.reference, 'view'))
12	12	{{html}}
13		-<a id="$anchor" class="$stringtool.join($cssClasses, ' ')" data-reference="$services.model.serialize($reference.reference, 'default')" href="$link">$content</a>
	14	+<a id="$escapetool.xml($anchor)" class="$stringtool.join($cssClasses, ' ')" data-reference="$escapetool.xml($services.model.serialize($reference.reference, 'default'))" href="$escapetool.xml($link)">
	15	+ $escapetool.xml($content)
	16	+</a>
14	14	{{/html}}
15	15	{{/velocity}}

Standardkategorie

...	...	@@ -1,0 +1,1 @@
	1	+Notifications

Makrobeschreibung

...	...	@@ -1,1 +1,1 @@
1		-Insert a user mention.
	1	+Inserts a user mention.

XWiki.WikiMacroParameterClass[3]

Parameter-Beschreibung

...	...	@@ -1,0 +1,1 @@
	1	+The type of mentioned actor.

Parameter-Name

...	...	@@ -1,0 +1,1 @@
	1	+type

Parameter-Typ

...	...	@@ -1,0 +1,1 @@
	1	+java.lang.String