Änderungen von Dokument MentionsMacro

Zusammenfassung

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

Details

XWiki.JavaScriptExtension[0]

Code

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

XWiki.WikiMacroClass[0]

Makro-Code

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

Standardkategorie

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

Makrobeschreibung

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

XWiki.WikiMacroParameterClass[3]

Parameter-Beschreibung

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

Parameter-Name

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

Parameter-Typ

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