Merge branch '4.13' into 4

silverstripe · Jan 25, 2024 · 9fbb2f3 · 9fbb2f3
2 parents 089151b + dfc42e7
commit 9fbb2f3
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 31 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
@@ -1,4 +1,4 @@
-/* global tinymce, editorIdentifier, ss */
+/* global tinymce, ss */
 import i18n from 'i18n';
 import TinyMCEActionRegistrar from 'lib/TinyMCEActionRegistrar';
 import React from 'react';
@@ -13,21 +13,22 @@ import { updatedCurrentField } from '../state/anchorSelector/AnchorSelectorActio
 
 const commandName = 'sslinkanchor';
 
-// Link to external url
-TinyMCEActionRegistrar
-  .addAction(
-    'sslink',
-    {
-      text: i18n._t('CMS.LINKLABEL_ANCHOR', 'Anchor on a page'),
-      onclick: (activeEditor) => activeEditor.execCommand(commandName),
-      priority: 60,
-    },
-    editorIdentifier,
-  )
-  .addCommandWithUrlTest(commandName, /^\[sitetree_link.+]#[^#\]]+$/);
-
 const plugin = {
   init(editor) {
+    // Add "Anchor on a page" to link menu for this editor
+    TinyMCEActionRegistrar
+      .addAction(
+        'sslink',
+        {
+          text: i18n._t('CMS.LINKLABEL_ANCHOR', 'Anchor on a page'),
+          onclick: (activeEditor) => activeEditor.execCommand(commandName),
+          priority: 60,
+        },
+        editor.settings.editorIdentifier,
+      )
+      .addCommandWithUrlTest(commandName, /^\[sitetree_link.+]#[^#\]]+$/);
+
+    // Add a command that corresponds with the above menu item
     editor.addCommand(commandName, () => {
       const field = jQuery(`#${editor.id}`).entwine('ss');
       // Get the anchors in the current field and save them as props for AnchorSelectorField

diff --git a/client/src/legacy/TinyMCE_sslink-internal.js b/client/src/legacy/TinyMCE_sslink-internal.js
@@ -1,4 +1,4 @@
-/* global tinymce, editorIdentifier, ss */
+/* global tinymce, ss */
 import i18n from 'i18n';
 import TinyMCEActionRegistrar from 'lib/TinyMCEActionRegistrar';
 import React from 'react';
@@ -12,21 +12,22 @@ import { provideInjector } from 'lib/Injector';
 
 const commandName = 'sslinkinternal';
 
-// Link to external url
-TinyMCEActionRegistrar
-  .addAction(
-    'sslink',
-    {
-      text: i18n._t('CMS.LINKLABEL_PAGE', 'Page on this site'),
-      onclick: (activeEditor) => activeEditor.execCommand(commandName),
-      priority: 90,
-    },
-    editorIdentifier,
-  )
-  .addCommandWithUrlTest(commandName, /^\[sitetree_link.+]$/);
-
 const plugin = {
   init(editor) {
+    // Add "Page on this site" to link menu for this editor
+    TinyMCEActionRegistrar
+      .addAction(
+        'sslink',
+        {
+          text: i18n._t('CMS.LINKLABEL_PAGE', 'Page on this site'),
+          onclick: (activeEditor) => activeEditor.execCommand(commandName),
+          priority: 90,
+        },
+        editor.settings.editorIdentifier,
+      )
+      .addCommandWithUrlTest(commandName, /^\[sitetree_link.+]$/);
+
+    // Add a command that corresponds with the above menu item
     editor.addCommand(commandName, () => {
       const field = jQuery(`#${editor.id}`).entwine('ss');
 

diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "silverstripe/admin": "^1.13@dev",
+        "silverstripe/admin": "^1.13.20",
         "silverstripe/campaign-admin": "^1.7@dev",
         "silverstripe/framework": "^4.11",
         "silverstripe/reports": "^4.7@dev",