Procházet zdrojové kódy

Revert "fix: electron menu handler(Redo, Undo, Copy) (#8466)"

This reverts commit 29da7386cbaf6e13ed6616490a03ded3cf09155c.
Andelf před 2 roky
rodič
revize
fb02c557f2
2 změnil soubory, kde provedl 2 přidání a 48 odebrání
  1. 1 36
      src/electron/electron/core.cljs
  2. 1 12
      src/main/electron/listener.cljs

+ 1 - 36
src/electron/electron/core.cljs

@@ -228,42 +228,7 @@
                                   (if mac?
                                     {:role "close"}
                                     {:role "quit"})]}
-                       {:role "editMenu"
-                        ;; https://github.com/electron/electron/blob/85f41d59aceabbdeee1fdec75770249c6335e73a/lib/browser/api/menu-item-roles.ts#L239-L276
-                        :submenu (concat
-                                  [{:label "Undo"
-                                    :click (fn []
-                                             (let [browser-window ^js/BrowserWindow @*win
-                                                   web-contents (.-webContents browser-window)]
-                                               (.send web-contents "invokeEditorHandler" "undo")))
-                                    :accelerator "CommandOrControl+Z"}
-                                   {:label "Redo"
-                                    :click (fn []
-                                             (let [browser-window ^js/BrowserWindow @*win
-                                                   web-contents (.-webContents browser-window)]
-                                               (.send web-contents "invokeEditorHandler" "redo")))
-                                    :accelerator "Shift+CommandOrControl+Z"}
-                                   {:type "separator"}
-                                   {:role "cut"}
-                                   {:label "Copy"
-                                    :click (fn []
-                                             (let [browser-window ^js/BrowserWindow @*win
-                                                   web-contents (.-webContents browser-window)]
-                                               (.send web-contents "invokeEditorHandler" "copy")))
-                                    :accelerator "CommandOrControl+C"}
-                                   {:role "paste"}]
-
-                                  (if mac?
-                                    [{:role "pasteAndMatchStyle"}
-                                     {:role "delete"}
-                                     {:role "selectAll"} ;; FIXME not work as expected
-                                     {:type "separator"}
-                                     {:label "Speech"
-                                      :submenu [{:role "startSpeaking"},
-                                                {:role "stopSpeaking"}]}]
-                                    [{:role "delete"}
-                                     {:type "separator"}
-                                     {:role "selectAll"}]))}
+                       {:role "editMenu"}
                        {:role "viewMenu"}
                        {:role "windowMenu"})
         ;; Windows has no about role

+ 1 - 12
src/main/electron/listener.cljs

@@ -12,7 +12,6 @@
             [frontend.fs.watcher-handler :as watcher-handler]
             [frontend.handler.editor :as editor-handler]
             [frontend.handler.file-sync :as file-sync-handler]
-            [frontend.handler.history :as history]
             [frontend.handler.notification :as notification]
             [frontend.handler.repo :as repo-handler]
             [frontend.handler.route :as route-handler]
@@ -182,17 +181,7 @@
 
   (js/window.apis.on "syncAPIServerState"
                      (fn [^js data]
-                       (state/set-state! :electron/server (bean/->clj data))))
-
-  (js/window.apis.on "invokeEditorHandler"
-                     (fn [action]
-                       (println "invokeEditorHandler with action:" action)
-                       (case action
-                         "undo" (history/undo! nil)
-                         "redo" (history/redo! nil)
-                         "copy" (editor-handler/shortcut-copy nil)
-                         "cut" (editor-handler/shortcut-cut nil) ;; FIXME this handler relies on arg Event
-                         ))))
+                       (state/set-state! :electron/server (bean/->clj data)))))
 
 (defn listen!
   []