Änderungen von Dokument MentionsMacro

Zusammenfassung

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

Details

XWiki.JavaScriptExtension[0]

Code

...	...	@@ -23,7 +23,7 @@
23	23
24	24	/**
25	25	* Compute a new unique anchor for the given reference.
26		- * The unique anchor is based on the mentionned user id, concatenaed with a random string of 6 alphanumeric
	26	+ * The unique anchor is based on the mentioned user id, concatenated with a random string of 6 alphanumeric
27	27	* characters.
28	28	* The chances of collision are quite low, about 46k mentions for a given mentioned user on a given page (assuming
29	29	* that no mentions are ever deleted).
...	...	@@ -62,8 +62,10 @@
62	62	ckeditorPromise.then(ckeditor => {
63	63	function getUserMentionsConfig(editor) {
64	64	return {
65		- feed: function (opts, callback) {
66		- search(opts.query, callback);
	65	+ dataCallback: function (options, callback) {
	66	+ // Remove the marker prefix and replace non-breaking space.
	67	+ const text = options.query.substring(1).replaceAll('\u00A0', ' ');
	68	+ search(text, callback);
67	67	},
68	68	marker: '@',
69	69	minChars: 0,
...	...	@@ -105,13 +105,8 @@
105	105	});
106	106
107	107	function maybeEnableUserMentions(editor) {
108		- return waitForEditorReady(editor).then((editor) => {
109		- // Check if the Mentions plugin is enabled for the given editor instance.
110		- // TODO: Add support for disabling the user mentions for a particular editor instance (without disabling all
111		- // types of mentions).
112		- if (editor.plugins.mentions) {
113		- editor.plugins.mentions.instances.push(new ckeditor.plugins.mentions(editor, getUserMentionsConfig(editor)));
114		- }
	110	+ return waitForEditorReady(editor).then(editor => {
	111	+ new CKEDITOR.plugins.AdvancedAutoComplete(editor, getUserMentionsConfig(editor));
115	115	return editor;
116	116	});
117	117	}