From 8d33f882e617c28b2529c873705de32ec2113762 Mon Sep 17 00:00:00 2001 From: srgooglo Date: Mon, 12 Oct 2020 12:07:09 +0200 Subject: [PATCH] fixed duplicated `queryIndexer` & fixed bad schema for `ipcInvoke` in windowNavbar --- src/components/Layout/WindowNavbar/index.js | 8 +++++-- src/models/app.js | 25 +-------------------- 2 files changed, 7 insertions(+), 26 deletions(-) diff --git a/src/components/Layout/WindowNavbar/index.js b/src/components/Layout/WindowNavbar/index.js index 8e38174a..db36c6c0 100644 --- a/src/components/Layout/WindowNavbar/index.js +++ b/src/components/Layout/WindowNavbar/index.js @@ -8,13 +8,17 @@ export default class WindowNavbar extends React.Component{ handleMinimize(){ this.props.dispatch({ type: "app/ipcInvoke", - payload: "minimize-window" + payload: { + key: "minimize-window" + } }) } handleClose(){ this.props.dispatch({ type: "app/ipcInvoke", - payload: "hide-window" + payload: { + key: "hide-window" + } }) } render(){ diff --git a/src/models/app.js b/src/models/app.js index 0f80f527..6bb404ee 100755 --- a/src/models/app.js +++ b/src/models/app.js @@ -95,7 +95,7 @@ export default { window.PluginGlobals = [] window.Internal = [] - + queryIndexer([ { match: '/s;:id', @@ -117,29 +117,6 @@ export default { window.location = callback }) - - queryIndexer([ - { - match: '/s;:id', - to: `/settings?key=:id`, - }, - { - match: '/h;:id', - to: `/hashtag?key=:id`, - }, - { - match: '/p;:id', - to: `/post?key=:id`, - }, - { - match: '/@:id', - to: `/@/:id`, - } - ], (callback) => { - window.location = callback - }) - - if (!service) { }