From a05e311ef6a7951202ca46eaaebe0aa87b28abe7 Mon Sep 17 00:00:00 2001 From: Vijay Aravamudhan Date: Mon, 4 Oct 2021 23:58:36 +0530 Subject: Upgrade 'electron' to '15.0.0' (#2018) (Couldn't upgrade 'electron' to '15.1.0' since the context menu is not working) --- README.md | 2 +- package-lock.json | 8 ++++---- package.json | 2 +- src/lib/Menu.js | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index f63e1920c..6ed5bf3d6 100644 --- a/README.md +++ b/README.md @@ -227,7 +227,7 @@ If you use an AUR Helper, e.g. yay, install it via `yay -S ferdi`. ### Adds internal changes -- [x] Upgrades to Electron 14.1.0 +- [x] Upgrades to Electron 15.0.0 - [x] Switches to [`electron-spellchecker`](https://github.com/electron-userland/electron-spellchecker) to improve application size - [x] Minifies build files to improve app size - [x] Adds "npm run prepare-code" command for development to lint and beautify code diff --git a/package-lock.json b/package-lock.json index a4bc73cec..8af4788b9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13066,12 +13066,12 @@ } }, "electron": { - "version": "14.1.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-14.1.0.tgz", - "integrity": "sha512-MnZSITjtdrY6jM/z/qXcuJqbIvz7MbxHp9f1O93mq/vt7aTxHYgjerPSqwya/RoUjkPEm1gkz669FsRk6ZtMdQ==", + "version": "15.0.0", + "resolved": "https://registry.npmjs.org/electron/-/electron-15.0.0.tgz", + "integrity": "sha512-LlBjN5nCJoC7EDrgfDQwEGSGSAo/o08nSP5uJxN2m+ZtNA69SxpnWv4yPgo1K08X/iQPoGhoZu6C8LYYlk1Dtg==", "dev": true, "requires": { - "@electron/get": "^1.0.1", + "@electron/get": "^1.13.0", "@types/node": "^14.6.2", "extract-zip": "^1.0.3" } diff --git a/package.json b/package.json index 97edff9d2..22a1a351e 100644 --- a/package.json +++ b/package.json @@ -171,7 +171,7 @@ "cross-env": "7.0.3", "cz-conventional-changelog": "3.3.0", "dotenv": "10.0.0", - "electron": "14.1.0", + "electron": "15.0.0", "electron-builder": "22.12.1", "electron-notarize": "1.1.0", "eslint": "7.32.0", diff --git a/src/lib/Menu.js b/src/lib/Menu.js index 499bf0824..cd86f1669 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js @@ -630,7 +630,7 @@ class FranzMenu { }, ); - if (this.stores.features.features.isTodosEnabled) { + if (this.stores.todos.isFeatureEnabledByUser) { tpl[1].submenu.push({ label: intl.formatMessage(menuItems.toggleTodosDevTools), accelerator: `${cmdOrCtrlShortcutKey()}+${shiftKey()}+${altKey()}+O`, -- cgit v1.2.3-54-g00ecf