Merge branch '2.1' into 2

silverstripe · Jan 31, 2024 · f8c0909 · f8c0909
2 parents badbc4f + 8607246
commit f8c0909
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/client/dist/js/TinyMCE_sslink-file.js b/client/dist/js/TinyMCE_sslink-file.js
diff --git a/client/dist/js/TinyMCE_ssmedia.js b/client/dist/js/TinyMCE_ssmedia.js
diff --git a/client/src/entwine/TinyMCE_sslink-file.js b/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');
 

diff --git a/client/src/entwine/TinyMCE_ssmedia.js b/client/src/entwine/TinyMCE_ssmedia.js
@@ -435,7 +435,7 @@ jQuery.entwine('ss', ($) => {
         properties: { id: data.ID },
       }, true);
 
-      const selectionContent = this.getElement().getSelection();
+      const selectionContent = editor.getSelection();
       let linkText = selectionContent || data.Text || data.filename;
 
       // if link was highlighted, then we don't want to place more text inside that text
@@ -553,7 +553,7 @@ jQuery.entwine('ss', ($) => {
      */
     statusMessage(text, type) {
       const content = $('<div/>').text(text).html(); // Escape HTML entities in text
-      $.noticeAdd({
+      jQuery.noticeAdd({
         text: content,
         type,
         stayTime: 5000,