Merge branch '4.13' into 4

silverstripe · Sep 17, 2023 · 3b1b38b · 3b1b38b
2 parents 40a9149 + ba578cf
commit 3b1b38b
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 26 deletions.
diff --git a/client/dist/js/TinyMCE_sslink-anchor.js b/client/dist/js/TinyMCE_sslink-anchor.js
diff --git a/client/dist/js/TinyMCE_sslink-internal.js b/client/dist/js/TinyMCE_sslink-internal.js
diff --git a/client/src/legacy/TinyMCE_sslink-anchor.js b/client/src/legacy/TinyMCE_sslink-anchor.js
@@ -74,10 +74,7 @@ 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 tagName = selection.getNode().tagName;
-      const requireLinkText = tagName !== 'A' && selectionContent.trim() === '';
+      const requireLinkText = this.getRequireLinkText();
       const currentPageID = Number($('#Form_EditForm_ID').val() || 0);
 
       // create/update the react component

diff --git a/client/src/legacy/TinyMCE_sslink-internal.js b/client/src/legacy/TinyMCE_sslink-internal.js
@@ -89,20 +89,6 @@ jQuery.entwine('ss', ($) => {
       );
     },
 
-    /**
-     * Determine whether to show the link text field
-     *
-     * @return {Boolean}
-     */
-    getRequireLinkText() {
-      const selection = this.getElement().getEditor().getInstance().selection;
-      const selectionContent = selection.getContent() || '';
-      const tagName = selection.getNode().tagName;
-      const requireLinkText = tagName !== 'A' && selectionContent.trim() === '';
-
-      return requireLinkText;
-    },
-
     /**
      * @param {Object} data - Posted data
      * @return {Object}

diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "silverstripe/admin": "^1.12@dev",
+        "silverstripe/admin": "^1.13@dev",
         "silverstripe/campaign-admin": "^1.7@dev",
         "silverstripe/framework": "^4.11",
         "silverstripe/reports": "^4.7@dev",
@@ -55,4 +55,4 @@
     },
     "prefer-stable": true,
     "minimum-stability": "dev"
-}
+}