Skip to content

Commit

Permalink
Upgrade electron to 0.2.14
Browse files Browse the repository at this point in the history
Signed-off-by: Rob Moran <[email protected]>
  • Loading branch information
thegecko committed Dec 11, 2018
1 parent eb586cd commit a37b81d
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion dev-packages/application-manager/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"copy-webpack-plugin": "^4.5.0",
"css-loader": "^0.28.1",
"style-loader": "^0.23.1",
"electron": "1.8.2-beta.5",
"electron": "^2.0.14",
"electron-rebuild": "^1.5.11",
"file-loader": "^1.1.11",
"font-awesome-webpack": "0.0.5-beta.2",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "0.0.0",
"engines": {
"yarn": "1.0.x || >=1.2.1",
"node": ">=7.9.0"
"node": ">=8.9.3"
},
"resolution": {
"**/@types/node": "8.10.20"
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@types/yargs": "^11.1.0",
"ajv": "^6.5.3",
"body-parser": "^1.17.2",
"electron": "1.8.2-beta.5",
"electron": "^2.0.14",
"es6-promise": "^4.2.4",
"express": "^4.16.3",
"file-icons-js": "^1.0.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ import { ElectronMainMenuFactory } from './electron-main-menu-factory';
@injectable()
export class ElectronContextMenuRenderer implements ContextMenuRenderer {

constructor( @inject(ElectronMainMenuFactory) private menuFactory: ElectronMainMenuFactory) {
constructor(@inject(ElectronMainMenuFactory) private menuFactory: ElectronMainMenuFactory) {
}

render(menuPath: MenuPath, anchor: Anchor, onHide?: () => void): void {
const menu = this.menuFactory.createContextMenu(menuPath);
menu.popup();
menu.popup({});
if (onHide) {
onHide();
}
Expand Down
8 changes: 5 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,7 @@
"@types/[email protected]":
version "8.10.20"
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.20.tgz#fe674ea52e13950ab10954433a7824438aabbcac"
integrity sha512-M7x8+5D1k/CuA6jhiwuSCmE8sbUWJF0wYsjcig9WrXvwUI5ArEoUBdOXpV4JcEMrLp02/QbDjw+kI+vQeKyQgg==

"@types/node@^8.0.24", "@types/node@^8.0.26":
version "8.10.26"
Expand Down Expand Up @@ -3467,9 +3468,10 @@ electron-window@^0.8.0:
dependencies:
is-electron-renderer "^2.0.0"

[email protected]:
version "1.8.2-beta.5"
resolved "https://registry.yarnpkg.com/electron/-/electron-1.8.2-beta.5.tgz#8324c483ed8cb4b052b3e13e514ddc858707fdeb"
electron@^2.0.14:
version "2.0.14"
resolved "https://registry.yarnpkg.com/electron/-/electron-2.0.14.tgz#fad6766645e7c0cd10b4ae822d3167959735a870"
integrity sha512-8HLVZuscZxVhoMUL6RlF5kMcwGUAMWw5HNwrEmRgzZyBIBbdCO4aMo9z0qknnPTUDROz8xXZFNhFvBXDu61g5Q==
dependencies:
"@types/node" "^8.0.24"
electron-download "^3.0.1"
Expand Down

0 comments on commit a37b81d

Please sign in to comment.