Changes for page EditSheet

Summary

• Objects (1 modified, 0 added, 0 removed)
  • XWiki.JavaScriptExtension[0]

Details

XWiki.JavaScriptExtension[0]

Code

...	...	@@ -81,21 +81,15 @@
81	81
82	82	// Extend the default CKEditor configuration with settings that depend on the source document.
83	83	var getConfig = function(element) {
84		- var sourceSyntax = $(element).attr('data-syntax');
85	85	var sourceDocument = XWiki.currentDocument;
86		- sourceDocument.syntax = XWiki.docsyntax;
87		- var sourceDocumentReference = XWiki.Model.resolve($(element).attr('data-sourceDocumentReference'),
88		- XWiki.EntityType.DOCUMENT, XWiki.currentDocument.documentReference);
89		- if (!XWiki.currentDocument.documentReference.equals(sourceDocumentReference)) {
90		- sourceDocument = new XWiki.Document(sourceDocumentReference);
91		- // We assume the syntax of the source document is the same as the syntax of the edited content.
92		- sourceDocument.syntax = sourceSyntax;
	85	+ var sourceDocumentReference = $(element).attr('data-sourceDocumentReference');
	86	+ if (sourceDocumentReference) {
	87	+ sourceDocument = new XWiki.Document(XWiki.Model.resolve(sourceDocumentReference, XWiki.EntityType.DOCUMENT));
93	93	}
	89	+ sourceDocument.syntax = $(element).attr('data-sourceDocumentSyntax');
94	94
95		- var uploadDisabled = element.hasAttribute('data-upload-disabled');
96		-
97	97	var config = {
98		- filebrowserUploadUrl: uploadDisabled ? '' : getUploadURL(sourceDocument, 'filebrowser'),
	92	+ filebrowserUploadUrl: getUploadURL(sourceDocument, 'filebrowser'),
99	99	height: $(element).height(),
100	100	mentions: [
101	101	{
...	...	@@ -120,19 +120,14 @@
120	120	'</div>',
121	121	'<div class="ckeditor-autocomplete-item-hint">{hint}</div>',
122	122	'</li>'].join(''),
123		- outputTemplate: '<a href="{url}" data-reference="{typed}|-|{type}|-|{reference}">{label}</a>',
124		- followingSpace: true,
	117	+ outputTemplate: '<a href="{url}" data-reference="{typed}|-|{type}|-|{reference}">{label}</a><span>&nbsp;</span>',
125	125	marker: '[',
126	126	minChars: 0,
127	127	itemsLimit: 6
128	128	}
129	129	],
130		- // Used to resolve and serialize relative references. Also used to make HTTP requests with the right context.
131	131	sourceDocument: sourceDocument,
132		- // The syntax of the edited content is not always the same as the syntax of the source document (which applies to
133		- // the source document content, but we might be editing something else, like an object property).
134		- sourceSyntax: sourceSyntax,
135		- uploadUrl: uploadDisabled ? '' : getUploadURL(sourceDocument, 'filetools'),
	124	+ uploadUrl: getUploadURL(sourceDocument, 'filetools'),
136	136	'xwiki-link': {
137	137	// We use the source document to compute the link label generator URL because we want the link references to be
138	138	// resolved relative to the edited document (as they were inserted).