diff --git a/app/lib/app.ts b/app/lib/app.ts index daa7d8484db27457c9b819d016f933cc6868c3dd..092ff7fd832443650245317d5e3cf8917c0f5b77 100644 --- a/app/lib/app.ts +++ b/app/lib/app.ts @@ -124,7 +124,7 @@ export class Application { { role: 'services', submenu: [] }, { type: 'separator' }, { role: 'hide' }, - { role: 'hideothers' }, + { role: 'hideOthers' }, { role: 'unhide' }, { type: 'separator' }, { @@ -145,21 +145,21 @@ export class Application { { role: 'cut' }, { role: 'copy' }, { role: 'paste' }, - { role: 'pasteandmatchstyle' }, + { role: 'pasteAndMatchStyle' }, { role: 'delete' }, - { role: 'selectall' }, + { role: 'selectAll' }, ], }, { label: 'View', submenu: [ { role: 'reload' }, - { role: 'forcereload' }, - { role: 'toggledevtools' }, + { role: 'forceReload' }, + { role: 'toggleDevTools' }, { type: 'separator' }, - { role: 'resetzoom' }, - { role: 'zoomin' }, - { role: 'zoomout' }, + { role: 'resetZoom' }, + { role: 'zoomIn' }, + { role: 'zoomOut' }, { type: 'separator' }, { role: 'togglefullscreen' }, ], diff --git a/app/package.json b/app/package.json index 2a9e02783b8c91647383d435038d2de039a3f5f9..2d1a3d6cda4c9b99962c84c042dc9c62b6df8a6b 100644 --- a/app/package.json +++ b/app/package.json @@ -22,11 +22,11 @@ "@angular/platform-browser-dynamic": "7.2.8", "@ng-bootstrap/ng-bootstrap": "^4.2.0", "devtron": "1.4.0", - "fontmanager-redux": "0.3.2", "electron-config": "2.0.0", "electron-debug": "^3.0.1", "electron-is-dev": "1.1.0", "electron-updater": "^4.0.6", + "fontmanager-redux": "0.3.3", "js-yaml": "3.13.1", "keytar": "^4.13.0", "mz": "^2.7.0", diff --git a/app/yarn.lock b/app/yarn.lock index ae7b5abaf99253a48459701adfd0d060ff13dd6f..0359f060223bd395d70201234a49f5f1882accdd 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -944,10 +944,10 @@ flush-write-stream@^1.0.0: inherits "^2.0.3" readable-stream "^2.3.6" -fontmanager-redux@0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/fontmanager-redux/-/fontmanager-redux-0.3.2.tgz#e5c8d8dc8fda98629eaef4201a27df9e56a122f4" - integrity sha512-NWmTbYfDijrx8qLJ2+O2VgYKhdfsMy/ec+Qf2DGxoLJDZHaRhBKd2Eufh4fFmfJUAwhzrkIgbKJsNT/IYJDbaA== +fontmanager-redux@0.3.3: + version "0.3.3" + resolved "https://registry.yarnpkg.com/fontmanager-redux/-/fontmanager-redux-0.3.3.tgz#39f3493332d1694ef3bd1652ee11d66ae3e4f495" + integrity sha512-n7bz3J+8gHn1+bEsIwdNlZ+wYsof3JPijHW/HQ+0oYA/zVTAuryXYgBrIKboNymJmYnabACoLB0p4tv/vMPGMA== forever-agent@~0.6.1: version "0.6.1" diff --git a/scripts/build-native.js b/scripts/build-native.js index 025029aea4c1d96c3610b4f9fad8ebdd8bdd68aa..3d1d09b2373b944a6cf1e7a4d77d37e9f88ed58f 100755 --- a/scripts/build-native.js +++ b/scripts/build-native.js @@ -3,21 +3,24 @@ const rebuild = require('electron-rebuild').default const path = require('path') const vars = require('./vars') -lifecycles = [] +let lifecycles = [] for (let dir of ['app', 'terminus-core', 'terminus-ssh', 'terminus-terminal']) { - build = rebuild({ - buildPath: path.resolve(__dirname, '../' + dir), - electronVersion: vars.electronVersion, - force: true, - }) - build.catch(() => process.exit(1)) - lifecycles.push([build.lifecycle, dir]) + const build = rebuild({ + buildPath: path.resolve(__dirname, '../' + dir), + electronVersion: vars.electronVersion, + force: true, + }) + build.catch(e => { + console.error(e) + process.exit(1) + }) + lifecycles.push([build.lifecycle, dir]) } console.info('Building against Electron', vars.electronVersion) for (let [lc, dir] of lifecycles) { - lc.on('module-found', name => { - console.info('Rebuilding', dir + '/' + name) - }) + lc.on('module-found', name => { + console.info('Rebuilding', dir + '/' + name) + }) } diff --git a/terminus-core/src/services/electron.service.ts b/terminus-core/src/services/electron.service.ts index c570f59824b5b6a541cc52f661ef7d9e3aa52b6c..09a177c4c28f5d507d01952fd76610f99849d22d 100644 --- a/terminus-core/src/services/electron.service.ts +++ b/terminus-core/src/services/electron.service.ts @@ -56,10 +56,6 @@ export class ElectronService { browserWindow: Electron.BrowserWindow, options: Electron.MessageBoxOptions ): Promise { - return new Promise(resolve => { - this.dialog.showMessageBox(browserWindow, options, (response, checkboxChecked) => { - resolve({ response, checkboxChecked }) - }) - }) + return this.dialog.showMessageBox(browserWindow, options) } }