Browse Source

:art: menu

Vanessa 2 years ago
parent
commit
a3af4cf722
3 changed files with 3 additions and 8 deletions
  1. 0 5
      app/src/layout/topBar.ts
  2. 2 2
      app/src/menus/Menu.ts
  3. 1 1
      app/src/types/index.d.ts

+ 0 - 5
app/src/layout/topBar.ts

@@ -94,11 +94,6 @@ export const initBar = (app: App) => {
                             } else {
                                 toolbarElement.dispatchEvent(new CustomEvent("click", {detail: itemId}));
                             }
-                            if (!window.siyuan.menus.menu.element.classList.contains("fn__none") &&
-                                window.siyuan.menus.menu.element.getAttribute("data-name") === "barmore") {
-                                return false;
-                            }
-                            return true;
                         }
                     }).element);
                 });

+ 2 - 2
app/src/menus/Menu.ts

@@ -179,11 +179,11 @@ export class MenuItem {
                 if (this.element.getAttribute("disabled")) {
                     return;
                 }
-                const result = options.click(this.element);
+                options.click(this.element);
                 event.preventDefault();
                 event.stopImmediatePropagation();
                 event.stopPropagation();
-                if (typeof result === "undefined" || !result) {
+                if (this.element.parentElement) {
                     window.siyuan.menus.menu.remove();
                 }
             });

+ 1 - 1
app/src/types/index.d.ts

@@ -724,7 +724,7 @@ declare interface IModels {
 
 declare interface IMenu {
     label?: string,
-    click?: (element: HTMLElement) => boolean | void,
+    click?: (element: HTMLElement) => void,
     type?: "separator" | "submenu" | "readonly",
     accelerator?: string,
     action?: string,