Changes for page ConfigSheet

Summary

• Page properties (2 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:XWiki.leung
	1	+XWiki.superadmin

Content

...	...	@@ -18,6 +18,26 @@
18	18	#set ($isTemporaryAttachmentSupported = "$!services.temporaryAttachments" != '')
19	19	#set ($htmlSyntax = ${services.wysiwyg.HTMLSyntax.toIdString()|'annotatedxhtml/1.0'})
20	20	#set ($isHTML5 = !$htmlSyntax.equals('annotatedxhtml/1.0'))
	21	+ ## Verify if the office import feature is supported.
	22	+ ##
	23	+ ## It's not enough to check if the Office server is connected because the 'importOfficeAttachment' API is available
	24	+ ## only since XWiki 9.8 (see XWIKI-14739) while the CKEditor Integration extension can be installed on older versions
	25	+ ## of XWiki where the users won't be able to import office documents from the CKEditor even if the Office server is
	26	+ ## connected. On these older versions the users will have to use the Create Page dialog with the Page from Office
	27	+ ## option.
	28	+ ##
	29	+ ## We check if the 'importOfficeAttachment' API is available by trying to import an attachment that doesn't exist
	30	+ ## using the Office Viewer macro, which should output an error message saying that the attachment doesn't exist. This
	31	+ ## way the Office server is not actually called so there's no risk of slowing down or blocking the CKEditor load (see
	32	+ ## CKEDITOR-294).
	33	+ #set ($missingAttachmentReference = $services.model.resolveAttachment('CKEditor.OfficeImporter@doesNotExist.txt'))
	34	+ #set ($officeServerConnected = $services.officemanager.isConnected())
	35	+ #if ("$!officeServerConnected" == '')
	36	+ ## Before XWiki 12.3 and 11.10.5
	37	+ #set ($officeServerConnected = $services.officemanager.serverState == 'Connected')
	38	+ #end
	39	+ #set ($officeImportSupported = $officeServerConnected &&
	40	+ "$!services.wysiwyg.importOfficeAttachment($missingAttachmentReference, {'useOfficeViewer': true})" != '')
21	21	## Global default configuration that doesn't depend on the edited content and that needs Velocity code for evaluation.
22	22	## Static global configuration (that doesn't need Velocity) should be put in config.js . The default instance level
23	23	## configuration is in EditSheet.
...	...	@@ -26,10 +26,11 @@
26	26	'htmlSyntax': $htmlSyntax,
27	27	'stylesSet': "#if ($isHTML5)html5#{else}html4#end",
28	28	'xwiki-office': {
29		- 'enabled': $services.officemanager.isConnected()
	49	+ 'enabled': $officeImportSupported
30	30	},
31	31	'xwiki-realtime': {
32	32	'stylesheets': [
	53	+ $services.webjars.url('org.xwiki.platform:xwiki-platform-realtime-webjar', 'webjar.bundle.min.css'),
33	33	$services.webjars.url('org.xwiki.platform:xwiki-platform-realtime-wysiwyg-webjar', 'webjar.bundle.min.css')
34	34	]
35	35	},

XWiki.JavaScriptExtension[0]

Code

...	...	@@ -24,19 +24,15 @@
24	24	var commaSeparator = /\s*,\s*/;
25	25	var enhanceConfig = function(editor) {
26	26	var availablePlugins = editor.config.plugins.split(commaSeparator);
27		- enhanceList($('#CKEditor\\.ConfigClass_0_removePlugins'), availablePlugins, 'available-plugins-select');
	27	+ enhanceList($('#CKEditor\\.ConfigClass_0_removePlugins'), availablePlugins);
28	28
29	29	var availableButtons = Object.keys(editor.ui.items);
30		- enhanceList($('#CKEditor\\.ConfigClass_0_removeButtons'), availableButtons, 'available-buttons-select');
31		-
32		- enhanceTextArea($('#CKEditor\\.ConfigClass_0_advanced'), 'advanced-text-area');
	30	+ enhanceList($('#CKEditor\\.ConfigClass_0_removeButtons'), availableButtons);
33	33	};
34	34
35		- var enhanceList = function(input, allowedValues, selectId) {
	33	+ var enhanceList = function(input, allowedValues) {
36	36	var values = input.hide().val().split(commaSeparator);
37	37	var select = $('<select class="form-control" multiple></select>').insertAfter(input);
38		- input.parent().prev().find('label').attr('for', selectId);
39		- select.attr('id', selectId);
40	40	allowedValues.sort().forEach(function(value) {
41	41	select.append($('<option></option>').text(value));
42	42	});
...	...	@@ -52,11 +52,6 @@
52	52	input.val(values.join(','));
53	53	});
54	54	};
55		-
56		- var enhanceTextArea = function(textarea, textareaId) {
57		- textarea.parent().prev().find('label').attr('for', textareaId);
58		- textarea.attr('id', textareaId);
59		- };
60	60
61	61	ckeditorPromise.done(function(ckeditor) {
62	62	ckeditor.once('instanceLoaded', function(event) {