CKEDITOR-499: Provide the source document to the html displayers of the macro parameters #72
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…he macro parameters
mflorea
requested changes
Dec 12, 2022
application-ckeditor-ui/src/main/resources/CKEditor/MacroService.xml
Outdated
Show resolved
Hide resolved
application-ckeditor-plugins/src/main/resources/xwiki-macro/macroEditor.js
Outdated
Show resolved
Hide resolved
mflorea
requested changes
Dec 14, 2022
| @@ -42,10 +42,13 @@ define('macroService', ['jquery', 'xwiki-meta'], function($, xcontext) { | |||
| if (macroDescriptor) { | |||
| deferred.resolve(macroDescriptor); | |||
| } else { | |||
| var url = new XWiki.Document('MacroService', 'CKEditor').getURL('get', $.param({ | |||
| var sourceDocument = CKEDITOR.currentInstance.element.getAttribute('data-sourceDocumentReference'); | |||
There was a problem hiding this comment.
I know I suggested this, but I forgot that the macro wizard (selector and editor) must be independent of the CKEditor. For instance, the macro wizard is used to insert / edit gadgets on the Dashboard, where there's no CKEditor instance. This means the macro wizard can't use the CKEDITOR API. Instead, we need to pass the source document as an optional parameter to the macro wizard. I mean, the code that starts the macro wizard should pass the source document reference as parameter, if it makes sense, otherwise the current document reference is used.
…he macro parameters
mflorea
requested changes
Dec 20, 2022
application-ckeditor-plugins/src/main/resources/xwiki-macro/plugin.js
Outdated
Show resolved
Hide resolved
application-ckeditor-plugins/src/main/resources/xwiki-macro/macroEditor.js
Outdated
Show resolved
Hide resolved
application-ckeditor-plugins/src/main/resources/xwiki-macro/macroEditor.js
Outdated
Show resolved
Hide resolved
mflorea
approved these changes
Dec 20, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The PR for the issue: https://jira.xwiki.org/browse/CKEDITOR-499