Fix double entries in command palette

Marc-Bernard-Tools · Feb 19, 2024 · db54d01 · db54d01
1 parent a3d323f
commit db54d01
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/#mbtools#mbt_common_js.w3mi.data.js b/src/#mbtools#mbt_common_js.w3mi.data.js
@@ -16,7 +16,8 @@
 /* exported enableArrowListNavigation */
 /* exported activateLinkHints */
 /* exported setKeyBindings */
-/* exported enumerateToolbarActions */
+/* exported CommandPalette */
+/* exported enumerateUiActions */
 
 /**********************************************************
  * Polyfills
@@ -1194,4 +1195,4 @@ function toggleBrowserControlWarning(){
 function displayBrowserControlFooter() {
   var out = document.getElementById("browser-control-footer");
   out.innerHTML = " - " + ( navigator.userAgent.includes("Edg") ? "Edge" : "IE"  );
-}
+}
diff --git a/src/ui/#mbtools#cl_gui_page.clas.abap b/src/ui/#mbtools#cl_gui_page.clas.abap
@@ -295,7 +295,7 @@ CLASS /mbtools/cl_gui_page IMPLEMENTATION.
 
   METHOD render_command_palettes.
 
-    ii_html->add( 'var gCommandPalette = new CommandPalette(enumerateToolbarActions, {' ).
+    ii_html->add( 'var gCommandPalette = new CommandPalette(enumerateUiActions, {' ).
     ii_html->add( '  toggleKey: "F1",' ).
     ii_html->add( '  hotkeyDescription: "Command ..."' ).
     ii_html->add( '});' ).

diff --git a/src/uipages/#mbtools#cl_gui_page_main.clas.abap b/src/uipages/#mbtools#cl_gui_page_main.clas.abap
@@ -297,7 +297,7 @@ CLASS /mbtools/cl_gui_page_main IMPLEMENTATION.
 
     CREATE OBJECT ro_menu EXPORTING iv_id = 'toolbar-main'.
 
-    CREATE OBJECT lo_support_menu.
+    CREATE OBJECT lo_support_menu EXPORTING iv_id = 'toolbar-support'.
 
     lo_support_menu->add(
       iv_txt = 'FAQ'
@@ -309,7 +309,7 @@ CLASS /mbtools/cl_gui_page_main IMPLEMENTATION.
       iv_txt = 'Ticket'
       iv_act = /mbtools/if_actions=>mbt_support ).
 
-    CREATE OBJECT lo_bar_menu.
+    CREATE OBJECT lo_bar_menu EXPORTING iv_id = 'toolbar-admin'.
 
     CASE iv_mode.
 
@@ -321,7 +321,7 @@ CLASS /mbtools/cl_gui_page_main IMPLEMENTATION.
 
       WHEN c_mode-admin.
 
-        CREATE OBJECT lo_tools_menu.
+        CREATE OBJECT lo_tools_menu EXPORTING iv_id = 'toolbar-tools'.
 
         lo_tools_menu->add(
           iv_txt = 'Add Tool'