Mastodon
/
Whalebird-desktop-client-mac-linux-windows
mirror of https://github.com/h3poteto/whalebird-desktop
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1007 from h3poteto/electron/5.0.9 

Update Electron version to 5.0.9
This commit is contained in:
AkiraFukushima 2019-08-18 16:25:19 +09:00 committed by GitHub
parent 17a8dc2d37 473b689b66
commit 3dcba952fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package-lock.json generated
View File

@ -7193,9 +7193,9 @@
"dev": true
},
"electron": {
"version": "4.2.4",
"resolved": "https://registry.npmjs.org/electron/-/electron-4.2.4.tgz",
"integrity": "sha512-d4wEwJluMsRyRgbukLmFVTb6l1J+mc3RLB1ctbpMlSWDFvs+zknPWa+cHBzTWwrdgwINLddr69qsAW1ku6FqYw==",
"version": "5.0.9",
"resolved": "https://registry.npmjs.org/electron/-/electron-5.0.9.tgz",
"integrity": "sha512-yCt+lnQr47OWB3Oei19odMVB8VKzecTwZLm75PB56f/keeJAM3UqV7+dtjKlPdKt0hJ4sWxe4vjxGPO/oZDv7A==",
"dev": true,
"requires": {
"@types/node": "^10.12.18",
@ -7204,9 +7204,9 @@
},
"dependencies": {
"@types/node": {
"version": "10.14.9",
"resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.9.tgz",
"integrity": "sha512-NelG/dSahlXYtSoVPErrp06tYFrvzj8XLWmKA+X8x0W//4MqbUyZu++giUG/v0bjAT6/Qxa8IjodrfdACyb0Fg==",
"version": "10.14.15",
"resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.15.tgz",
"integrity": "sha512-CBR5avlLcu0YCILJiDIXeU2pTw7UK/NIxfC63m7d7CVamho1qDEzXKkOtEauQRPMy6MI8mLozth+JJkas7HY6g==",
"dev": true
}
}

4
package.json
View File

@ -31,7 +31,7 @@
"build:linux": "npm run build && npm run package:linux",
"build:win32": "npm run build && npm run package:win32",
"build:win64": "npm run build && npm run package:win64",
"build:mas": "npm run build:clean && npm run pack && electron-packager ./ 'Whalebird' --platform=mas --arch=x64 --electron-version=4.2.4 --asar.unpackDir='build/sounds' --out=packages --ignore='^/src' --ignore='^/.electron-vue' --ignore='^/.envrc' --ignore='^/packages' --ignore='^/plist' --ignore='^/static' --ignore='^/whalebird.db' --ignore='^/screenshot.png' --prune=true --icon=./build/icons/icon.icns --overwrite --app-bundle-id=org.whalebird.desktop --app-version=$npm_package_config_appVersion --build-version=$npm_package_config_buildVersion --extend-info='./plist/team.plist' --osx-sign --app-category-type=public.app-category.social-networking",
"build:mas": "npm run build:clean && npm run pack && electron-packager ./ 'Whalebird' --platform=mas --arch=x64 --electron-version=5.0.9 --asar.unpackDir='build/sounds' --out=packages --ignore='^/src' --ignore='^/.electron-vue' --ignore='^/.envrc' --ignore='^/packages' --ignore='^/plist' --ignore='^/static' --ignore='^/whalebird.db' --ignore='^/screenshot.png' --prune=true --icon=./build/icons/icon.icns --overwrite --app-bundle-id=org.whalebird.desktop --app-version=$npm_package_config_appVersion --build-version=$npm_package_config_buildVersion --extend-info='./plist/team.plist' --osx-sign --app-category-type=public.app-category.social-networking",
"package:mac": "electron-builder --mac --x64",
"package:linux": "electron-builder --linux",
"package:win32": "electron-builder --win --ia32",
@ -229,7 +229,7 @@
"css-loader": "^3.0.0",
"del": "^3.0.0",
"devtron": "^1.4.0",
"electron": "4.2.4",
"electron": "5.0.9",
"electron-builder": "^20.44.4",
"electron-debug": "^2.2.0",
"electron-devtools-installer": "^2.2.4",

8
src/main/index.ts
View File

@ -276,13 +276,13 @@ app.on('window-all-closed', () => {
const menu = Menu.getApplicationMenu()
if (menu !== null) {
// Preferences
;((menu.items[0] as MenuItemConstructorOptions).submenu as Menu).items[2].enabled = false as boolean
menu.items[0].submenu.items[2].enabled = false as boolean
// New Toot
;((menu.items[1] as MenuItemConstructorOptions).submenu as Menu).items[0].enabled = false as boolean
menu.items[1].submenu.items[0].enabled = false as boolean
// Open Window
;((menu.items[4] as MenuItemConstructorOptions).submenu as Menu).items[1].enabled = true as boolean
menu.items[4].submenu.items[1].enabled = true as boolean
// Jump to
;((menu.items[4] as MenuItemConstructorOptions).submenu as Menu).items[4].enabled = false as boolean
menu.items[4].submenu.items[4].enabled = false as boolean
}
}
})