ENH Refactor sslink slightly for easier maintenance (#1661)

silverstripe · Jan 25, 2024 · c16fb0f · c16fb0f
1 parent 20dbe25
commit c16fb0f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 23 deletions.
diff --git a/client/dist/js/TinyMCE_sslink.js b/client/dist/js/TinyMCE_sslink.js
diff --git a/client/src/legacy/TinyMCE_sslink.js b/client/src/legacy/TinyMCE_sslink.js
@@ -11,6 +11,16 @@ const plugin = {
    * @param {Object} editor
    */
   init(editor) {
+    function getActions() {
+      // Fetch the actions whenever the fetch function is called.
+      return TinyMCEActionRegistrar.getSortedActions('sslink', editor.getParam('editorIdentifier'), true)
+        .map(action => Object.assign(
+          {},
+          action,
+          { onAction: () => action.onAction(editor) }
+        ));
+    }
+
     const metaKey = navigator.platform.toUpperCase().includes('MAC') ? '⌘' : 'Ctrl';
     const title = i18n._t('Admin.INSERT_LINK', 'Insert link');
     const titleWithShortcut = i18n.inject(
@@ -33,33 +43,18 @@ const plugin = {
       }
     }
 
+    // Button in main toolbar
     editor.ui.registry.addMenuButton('sslink', {
       icon: 'link',
       tooltip: titleWithShortcut,
-      fetch: (callback) => callback(
-        // Fetch the actions whenever the fetch function is called.
-        TinyMCEActionRegistrar.getSortedActions('sslink', editor.getParam('editorIdentifier'), true)
-          .map(action => Object.assign(
-            {},
-            action,
-            { onAction: () => action.onAction(editor) }
-          ))
-      ),
+      fetch: (callback) => callback(getActions()),
     });
 
-    editor.on('preinit', () => {
-      // Right click context menu item
-      editor.ui.registry.addNestedMenuItem('sslink', {
-        icon: 'link',
-        text: title,
-        getSubmenuItems: () => // Fetch the actions whenever the fetch function is called.
-          TinyMCEActionRegistrar.getSortedActions('sslink', editor.getParam('editorIdentifier'), true)
-            .map(action => Object.assign(
-              {},
-              action,
-              { onAction: () => action.onAction(editor) }
-            )),
-      });
+    // Right click context menu item
+    editor.ui.registry.addNestedMenuItem('sslink', {
+      icon: 'link',
+      text: title,
+      getSubmenuItems: getActions,
     });
 
     // Context menu when a link is selected