Änderungen von Dokument MentionsMacro

Zusammenfassung

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

Details

XWiki.JavaScriptExtension[0]

Code

...	...	@@ -4,12 +4,12 @@
4	4	}
5	5	});
6	6	require(['deferred!ckeditor', 'xwiki-suggestUsers', 'jquery', 'xwiki-meta'], function (ckeditorPromise, suggestUsers, $, xm) {
7		-
	7	+
8	8	/**
9	9	* Get the current wiki scope for displaying global, local or global and local users
10	10	*/
11	11	const userScope = "$!services.wiki.user.userScope";
12		-
	12	+
13	13	// see https://stackoverflow.com/a/6248722/657524
14	14	function random6chars() {
15	15	// I generate the UID from two parts here
...	...	@@ -20,7 +20,7 @@
20	20	secondPart = ("000" + secondPart.toString(36)).slice(-3);
21	21	return firstPart + secondPart;
22	22	}
23		-
	23	+
24	24	/**
25	25	* Compute a new unique anchor for the given reference.
26	26	* The unique anchor is based on the mentionned user id, concatenaed with a random string of 6 alphanumeric
...	...	@@ -39,8 +39,8 @@
39	39	'input': text,
40	40	'limit': 6,
41	41	};
42		- suggestUsers.loadUsers(userScope, params).then(users => {
43		- const cct = users.map(function (x) {
	42	+ $.when(suggestUsers.loadUsers(userScope, params)).then(function (user) {
	43	+ const cct = user.map(function (x) {
44	44	// insert an id because that's required by the mentions plugins.
45	45	x.id = x.value;
46	46	// Make sure to display the icon avatar or the image one.
...	...	@@ -56,10 +56,10 @@
56	56	return x;
57	57	});
58	58	callback(cct);
59		- });
	59	+ })
60	60	}
61	61
62		- ckeditorPromise.then(ckeditor => {
	62	+ ckeditorPromise.done(function (ckeditor) {
63	63	function confMentions(name) {
64	64	return {
65	65	feed: function (opts, callback) {
...	...	@@ -82,7 +82,7 @@
82	82	editor.once('afterInsertHtml', function () {
83	83	editor.execCommand('xwiki-macro-insert', {
84	84	name: 'mention',
85		- inline: 'enforce',
	85	+ 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 || {};
	101	+ const newConf = config;
102	102	newConf.mentions = newConf.mentions || [];
103	103	newConf.mentions.push(confMentions(name));
104	104	return newConf;