FIX Add tinymce link menuitems per editor instance #1653
Merged
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
4 tasks
GuySartorelli
force-pushed
the
pulls/1.13/fix-tinymce-link-plugins
branch
from
aa2e7c3
to
88ddba9
Compare
This was referenced Jan 23, 2024
Merged
GuySartorelli
force-pushed
the
pulls/1.13/fix-tinymce-link-plugins
branch
2 times, most recently
from
893894c
to
294c4f3
Compare
7 tasks
GuySartorelli
force-pushed
the
pulls/1.13/fix-tinymce-link-plugins
branch
from
294c4f3
to
33889ac
Compare
GuySartorelli
force-pushed
the
pulls/1.13/fix-tinymce-link-plugins
branch
from
33889ac
to
aeb4844
Compare
GuySartorelli
commented
Jan 24, 2024
Comment on lines
+14
to
+23
| // Add "Link to email address" to link menu for this editor | ||
| TinyMCEActionRegistrar.addAction( | ||
| 'sslink', | ||
| { | ||
| text: i18n._t('Admin.LINKLABEL_EMAIL', 'Link to email address'), | ||
| onclick: (editorInst) => editorInst.execCommand(commandName), | ||
| priority: 51, | ||
| }, | ||
| editor.settings.editorIdentifier, | ||
| ).addCommandWithUrlTest(commandName, /^mailto:/); |
There was a problem hiding this comment.
Moving this into here means we have access to the actual editor instance, so we can find its unique editor identifier.
Note the change from editorIdentifier to editor.settings.editorIdentifier.
If multiple editors use the same config (and therefore have the same identifier), the action is not duplicated - there's deduping logic in TinyMCEActionRegistrar to handle that.
GuySartorelli
commented
Jan 24, 2024
Comment on lines
-22
to
-40
| const actions = TinyMCEActionRegistrar.getSortedActions('sslink', editor.settings.editorIdentifier, true) | ||
| .map(action => Object.assign( | ||
| {}, | ||
| action, | ||
| { onclick: () => action.onclick(editor) } | ||
| )); | ||
|
|
||
| editor.addButton('sslink', { | ||
| icon: 'link', | ||
| title: titleWithShortcut, | ||
| type: 'menubutton', | ||
| menu: actions, | ||
| }); | ||
|
|
||
| editor.addMenuItem('sslink', { | ||
| icon: 'link', | ||
| text: title, | ||
| menu: actions, | ||
| }); |
There was a problem hiding this comment.
The additional link type plugins' init function hasn't been called yet, so we have to defer this.
emteknetnz
approved these changes
Jan 24, 2024
7 tasks
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.
Description
Fixes an issue where multiple tinymce instances with different configs don't correctly register the link menus.
There is (or will be) associated PRs for asset-admin and cms as well, to update their tinymce link plugins.
Note that this change is backwards compatible with older versions of cms or asset-admin, but the PRs for those modules are not backwards compatible with older versions of this module.
Manual testing steps
See issue for reproduction steps
Issues
Pull request checklist