Merge branch '1' into 2.1

client/src/entwine/TinyMCE_sslink-file.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';
@@ -11,20 +11,21 @@ import * as modalActions from 'state/modal/ModalActions';
 
 const commandName = 'sslinkfile';
 
-// Link to external url
-TinyMCEActionRegistrar.addAction(
-  'sslink',
-  {
-    text: i18n._t('AssetAdmin.LINKLABEL_FILE', 'Link to a file'),
-    // eslint-disable-next-line no-console
-    onAction: (activeEditor) => activeEditor.execCommand(commandName),
-    priority: 80
-  },
-  editorIdentifier,
-).addCommandWithUrlTest(commandName, /^\[file_link/);
-
 const plugin = {
   init(editor) {
+    // Add "Link to external url" to link menu for this editor
+    TinyMCEActionRegistrar.addAction(
+      'sslink',
+      {
+        text: i18n._t('AssetAdmin.LINKLABEL_FILE', 'Link to a file'),
+        // eslint-disable-next-line no-console
+        onAction: (activeEditor) => activeEditor.execCommand(commandName),
+        priority: 80
+      },
+      editor.getParam('editorIdentifier'),
+    ).addCommandWithUrlTest(commandName, /^\[file_link/);
+
+    // Add a command that corresponds with the above menu item
     editor.addCommand(commandName, () => {
       const field = jQuery(`#${editor.id}`).entwine('ss');
 

composer.json

@@ -6,7 +6,7 @@
     "require": {
         "php": "^8.1",
         "silverstripe/framework": "^5.1",
-        "silverstripe/admin": "^2",
+        "silverstripe/admin": "^2.1.11",
         "silverstripe/graphql": "^5"
     },
     "require-dev": {