Changes for page EditSheet

Summary

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

Details

Page properties

Author

...	...	@@ -1,1 +1,1 @@
1		-XWiki.coelho
	1	+XWiki.thw

XWiki.JavaScriptExtension[0]

Code

...	...	@@ -81,16 +81,12 @@
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	95	var config = {
96	96	filebrowserUploadUrl: getUploadURL(sourceDocument, 'filebrowser'),
...	...	@@ -118,18 +118,13 @@
118	118	'</div>',
119	119	'<div class="ckeditor-autocomplete-item-hint">{hint}</div>',
120	120	'</li>'].join(''),
121		- outputTemplate: '<a href="{url}" data-reference="{typed}|-|{type}|-|{reference}">{label}</a>',
122		- followingSpace: true,
	117	+ outputTemplate: '<a href="{url}" data-reference="{typed}|-|{type}|-|{reference}">{label}</a><span>&nbsp;</span>',
123	123	marker: '[',
124	124	minChars: 0,
125	125	itemsLimit: 6
126	126	}
127	127	],
128		- // Used to resolve and serialize relative references. Also used to make HTTP requests with the right context.
129	129	sourceDocument: sourceDocument,
130		- // The syntax of the edited content is not always the same as the syntax of the source document (which applies to
131		- // the source document content, but we might be editing something else, like an object property).
132		- sourceSyntax: sourceSyntax,
133	133	uploadUrl: getUploadURL(sourceDocument, 'filetools'),
134	134	'xwiki-link': {
135	135	// We use the source document to compute the link label generator URL because we want the link references to be