Merge branch '2.2' into 2

silverstripe · Aug 27, 2024 · 1968e3f · 1968e3f
2 parents 2a05026 + 27a2da7
commit 1968e3f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/client/dist/js/TinyMCE_sslink.js b/client/dist/js/TinyMCE_sslink.js
diff --git a/client/src/legacy/TinyMCE_sslink.js b/client/src/legacy/TinyMCE_sslink.js
@@ -35,6 +35,9 @@ const plugin = {
 
     // Callback for opening the edit link dialog form
     function openLinkDialog() {
+      // Find "a" node (we might have clicked on a child element e.g. "span")
+      const linkNode = jQuery(tinymce.activeEditor.selection.getNode()).closest('a');
+      tinymce.activeEditor.selection.select(linkNode[0]);
       const node = tinymce.activeEditor.selection.getNode();
       const href = node.getAttribute('href');
 
@@ -192,7 +195,11 @@ jQuery.entwine('ss', ($) => {
      */
     getRequireLinkText() {
       const editor = this.getElement().getEditor();
-      const selection = editor.getInstance().selection;
+      let selection = editor.getInstance().selection;
+      const node = $(selection.getNode()).closest('a');
+      editor.getInstance().selection.select(node[0]);
+
+      selection = editor.getInstance().selection;
       const isValidSelection = this.linkCanWrapSelection(editor, selection);
       const tagName = selection.getNode().tagName;
       const requireLinkText = tagName !== 'A' && !isValidSelection;