aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Vijay Aravamudhan <vraravam@users.noreply.github.com>2021-10-04 23:58:36 +0530
committerLibravatar GitHub <noreply@github.com>2021-10-04 23:58:36 +0530
commita05e311ef6a7951202ca46eaaebe0aa87b28abe7 (patch)
treeec389d47d43a64a9c5356fd888083b657bfbdc5e
parentchore: upgraded electron to 14.1.0 (#1860) (diff)
downloadferdium-app-a05e311ef6a7951202ca46eaaebe0aa87b28abe7.tar.gz
ferdium-app-a05e311ef6a7951202ca46eaaebe0aa87b28abe7.tar.zst
ferdium-app-a05e311ef6a7951202ca46eaaebe0aa87b28abe7.zip
Upgrade 'electron' to '15.0.0' (#2018)
(Couldn't upgrade 'electron' to '15.1.0' since the context menu is not working)
-rw-r--r--README.md2
-rw-r--r--package-lock.json8
-rw-r--r--package.json2
-rw-r--r--src/lib/Menu.js2
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`.
227 227
228### Adds internal changes 228### Adds internal changes
229 229
230- [x] Upgrades to Electron 14.1.0 230- [x] Upgrades to Electron 15.0.0
231- [x] Switches to [`electron-spellchecker`](https://github.com/electron-userland/electron-spellchecker) to improve application size 231- [x] Switches to [`electron-spellchecker`](https://github.com/electron-userland/electron-spellchecker) to improve application size
232- [x] Minifies build files to improve app size 232- [x] Minifies build files to improve app size
233- [x] Adds "npm run prepare-code" command for development to lint and beautify code 233- [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 @@
13066 } 13066 }
13067 }, 13067 },
13068 "electron": { 13068 "electron": {
13069 "version": "14.1.0", 13069 "version": "15.0.0",
13070 "resolved": "https://registry.npmjs.org/electron/-/electron-14.1.0.tgz", 13070 "resolved": "https://registry.npmjs.org/electron/-/electron-15.0.0.tgz",
13071 "integrity": "sha512-MnZSITjtdrY6jM/z/qXcuJqbIvz7MbxHp9f1O93mq/vt7aTxHYgjerPSqwya/RoUjkPEm1gkz669FsRk6ZtMdQ==", 13071 "integrity": "sha512-LlBjN5nCJoC7EDrgfDQwEGSGSAo/o08nSP5uJxN2m+ZtNA69SxpnWv4yPgo1K08X/iQPoGhoZu6C8LYYlk1Dtg==",
13072 "dev": true, 13072 "dev": true,
13073 "requires": { 13073 "requires": {
13074 "@electron/get": "^1.0.1", 13074 "@electron/get": "^1.13.0",
13075 "@types/node": "^14.6.2", 13075 "@types/node": "^14.6.2",
13076 "extract-zip": "^1.0.3" 13076 "extract-zip": "^1.0.3"
13077 } 13077 }
diff --git a/package.json b/package.json
index 97edff9d2..22a1a351e 100644
--- a/package.json
+++ b/package.json
@@ -171,7 +171,7 @@
171 "cross-env": "7.0.3", 171 "cross-env": "7.0.3",
172 "cz-conventional-changelog": "3.3.0", 172 "cz-conventional-changelog": "3.3.0",
173 "dotenv": "10.0.0", 173 "dotenv": "10.0.0",
174 "electron": "14.1.0", 174 "electron": "15.0.0",
175 "electron-builder": "22.12.1", 175 "electron-builder": "22.12.1",
176 "electron-notarize": "1.1.0", 176 "electron-notarize": "1.1.0",
177 "eslint": "7.32.0", 177 "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 {
630 }, 630 },
631 ); 631 );
632 632
633 if (this.stores.features.features.isTodosEnabled) { 633 if (this.stores.todos.isFeatureEnabledByUser) {
634 tpl[1].submenu.push({ 634 tpl[1].submenu.push({
635 label: intl.formatMessage(menuItems.toggleTodosDevTools), 635 label: intl.formatMessage(menuItems.toggleTodosDevTools),
636 accelerator: `${cmdOrCtrlShortcutKey()}+${shiftKey()}+${altKey()}+O`, 636 accelerator: `${cmdOrCtrlShortcutKey()}+${shiftKey()}+${altKey()}+O`,