diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/electron/ipc-api/autoUpdate.js | 3 | ||||
m--------- | src/internal-server | 0 | ||||
-rw-r--r-- | src/stores/AppStore.js | 4 | ||||
-rw-r--r-- | src/webview/contextMenuBuilder.js | 7 |
4 files changed, 9 insertions, 5 deletions
diff --git a/src/electron/ipc-api/autoUpdate.js b/src/electron/ipc-api/autoUpdate.js index 603049c4e..5305d5618 100644 --- a/src/electron/ipc-api/autoUpdate.js +++ b/src/electron/ipc-api/autoUpdate.js | |||
@@ -28,9 +28,10 @@ export default (params) => { | |||
28 | } | 28 | } |
29 | 29 | ||
30 | if (args.action === 'check') { | 30 | if (args.action === 'check') { |
31 | debug('checking for update'); | ||
31 | autoUpdater.checkForUpdates(); | 32 | autoUpdater.checkForUpdates(); |
32 | } else if (args.action === 'install') { | 33 | } else if (args.action === 'install') { |
33 | debug('install update'); | 34 | debug('installing update'); |
34 | autoUpdater.quitAndInstall(); | 35 | autoUpdater.quitAndInstall(); |
35 | // we need to send a quit event | 36 | // we need to send a quit event |
36 | setTimeout(() => { | 37 | setTimeout(() => { |
diff --git a/src/internal-server b/src/internal-server | |||
Subproject e4fc9c6c3666eadc26a472b9b1c2a701dd3464b | Subproject 71d77a3776946a46acad03a8484f8fa3c4b42bf | ||
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js index ac6ca6d2d..bbb5e6305 100644 --- a/src/stores/AppStore.js +++ b/src/stores/AppStore.js | |||
@@ -180,7 +180,7 @@ export default class AppStore extends Store { | |||
180 | } | 180 | } |
181 | }); | 181 | }); |
182 | 182 | ||
183 | // Handle deep linking (franz://) | 183 | // Handle deep linking (ferdi://) |
184 | ipcRenderer.on('navigateFromDeepLink', (event, data) => { | 184 | ipcRenderer.on('navigateFromDeepLink', (event, data) => { |
185 | debug('Navigate from deep link', data); | 185 | debug('Navigate from deep link', data); |
186 | let { | 186 | let { |
@@ -389,6 +389,7 @@ export default class AppStore extends Store { | |||
389 | 389 | ||
390 | @action _checkForUpdates() { | 390 | @action _checkForUpdates() { |
391 | if (this.isOnline) { | 391 | if (this.isOnline) { |
392 | debug('_checkForUpdates: sending event to autoUpdate:check'); | ||
392 | this.updateStatus = this.updateStatusTypes.CHECKING; | 393 | this.updateStatus = this.updateStatusTypes.CHECKING; |
393 | ipcRenderer.send('autoUpdate', { | 394 | ipcRenderer.send('autoUpdate', { |
394 | action: 'check', | 395 | action: 'check', |
@@ -399,6 +400,7 @@ export default class AppStore extends Store { | |||
399 | } | 400 | } |
400 | 401 | ||
401 | @action _installUpdate() { | 402 | @action _installUpdate() { |
403 | debug('_installUpdate: sending event to autoUpdate:install'); | ||
402 | ipcRenderer.send('autoUpdate', { | 404 | ipcRenderer.send('autoUpdate', { |
403 | action: 'install', | 405 | action: 'install', |
404 | }); | 406 | }); |
diff --git a/src/webview/contextMenuBuilder.js b/src/webview/contextMenuBuilder.js index 500a1a653..63eed2ebe 100644 --- a/src/webview/contextMenuBuilder.js +++ b/src/webview/contextMenuBuilder.js | |||
@@ -22,6 +22,7 @@ function matchesWord(string) { | |||
22 | return string.match(regex); | 22 | return string.match(regex); |
23 | } | 23 | } |
24 | 24 | ||
25 | // TODO: Need to externalize for i18n | ||
25 | const contextMenuStringTable = { | 26 | const contextMenuStringTable = { |
26 | lookUpDefinition: ({ word }) => `Look Up "${word}"`, | 27 | lookUpDefinition: ({ word }) => `Look Up "${word}"`, |
27 | cut: () => 'Cut', | 28 | cut: () => 'Cut', |
@@ -217,7 +218,7 @@ module.exports = class ContextMenuBuilder { | |||
217 | this.addSeparator(menu); | 218 | this.addSeparator(menu); |
218 | this.goBack(menu); | 219 | this.goBack(menu); |
219 | this.goForward(menu); | 220 | this.goForward(menu); |
220 | this.copyPageUrl(menu); | 221 | this.copyPageUrl(menu, menuInfo); |
221 | this.goToHomePage(menu, menuInfo); | 222 | this.goToHomePage(menu, menuInfo); |
222 | this.openInBrowser(menu, menuInfo); | 223 | this.openInBrowser(menu, menuInfo); |
223 | 224 | ||
@@ -514,13 +515,13 @@ module.exports = class ContextMenuBuilder { | |||
514 | /** | 515 | /** |
515 | * Adds the 'copy page url' menu item. | 516 | * Adds the 'copy page url' menu item. |
516 | */ | 517 | */ |
517 | copyPageUrl(menu) { | 518 | copyPageUrl(menu, menuInfo) { |
518 | menu.append(new MenuItem({ | 519 | menu.append(new MenuItem({ |
519 | label: this.stringTable.copyPageUrl(), | 520 | label: this.stringTable.copyPageUrl(), |
520 | enabled: true, | 521 | enabled: true, |
521 | click: () => { | 522 | click: () => { |
522 | clipboard.writeText(window.location.href); | 523 | clipboard.writeText(window.location.href); |
523 | this._sendNotificationOnClipboardEvent(menu.clipboardNotifications, () => `Page URL copied: ${window.location.href}`); | 524 | this._sendNotificationOnClipboardEvent(menuInfo.clipboardNotifications, () => `Page URL copied: ${window.location.href}`); |
524 | }, | 525 | }, |
525 | })); | 526 | })); |
526 | 527 | ||