FIX Use correct tinymce selection logic

silverstripe · Sep 30, 2022 · 7b3ac23 · 7b3ac23
1 parent 7f81b8f
commit 7b3ac23
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 7 deletions.
diff --git a/client/dist/js/TinyMCE_sslink-email.js b/client/dist/js/TinyMCE_sslink-email.js
diff --git a/client/dist/js/TinyMCE_sslink-external.js b/client/dist/js/TinyMCE_sslink-external.js
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/legacy/HtmlEditorField.js b/client/src/legacy/HtmlEditorField.js
@@ -185,6 +185,15 @@ ss.editorWrappers.tinyMCE = (function() {
       return this.getInstance().getContent();
     },
 
+    getSelection: function() {
+      const instance = this.getInstance();
+      let selection = instance.selection.getContent({ format: 'text' });
+      if (!selection) {
+        selection = instance.selection.getSel().toString();
+      }
+      return selection || '';
+    },
+
     /**
      * DOM tree of the edited content
      *

diff --git a/client/src/legacy/TinyMCE_sslink-email.js b/client/src/legacy/TinyMCE_sslink-email.js
@@ -59,8 +59,9 @@ jQuery.entwine('ss', ($) => {
       const handleHide = () => this.close();
       const handleInsert = (...args) => this.handleInsert(...args);
       const attrs = this.getOriginalAttributes();
-      const selection = tinymce.activeEditor.selection;
-      const selectionContent = selection.getContent() || '';
+      const editor = this.getElement().getEditor();
+      const selection = editor.getInstance().selection;
+      const selectionContent = editor.getSelection();
       const tagName = selection.getNode().tagName;
       const requireLinkText = tagName !== 'A' && selectionContent.trim() === '';
 

diff --git a/client/src/legacy/TinyMCE_sslink-external.js b/client/src/legacy/TinyMCE_sslink-external.js
@@ -54,8 +54,9 @@ jQuery.entwine('ss', ($) => {
       const handleHide = () => this.close();
       const handleInsert = (...args) => this.handleInsert(...args);
       const attrs = this.getOriginalAttributes();
-      const selection = tinymce.activeEditor.selection;
-      const selectionContent = selection.getContent() || '';
+      const editor = this.getElement().getEditor();
+      const selection = editor.getInstance().selection;
+      const selectionContent = editor.getSelection();
       const tagName = selection.getNode().tagName;
       const requireLinkText = tagName !== 'A' && selectionContent.trim() === '';