diff options
author | 2019-10-24 15:15:42 +0200 | |
---|---|---|
committer | 2019-10-24 15:15:42 +0200 | |
commit | 54f8b191a94bd78a85b046bbf21dd2245d3a6f3e (patch) | |
tree | ada5876f0e8a697ba4693bba07f5e0f31fea1fc9 /src/lib | |
parent | Update submodules (diff) | |
parent | bump version to 5.4.0 (diff) | |
download | ferdium-app-54f8b191a94bd78a85b046bbf21dd2245d3a6f3e.tar.gz ferdium-app-54f8b191a94bd78a85b046bbf21dd2245d3a6f3e.tar.zst ferdium-app-54f8b191a94bd78a85b046bbf21dd2245d3a6f3e.zip |
Merge https://github.com/meetfranz/franz into franz-5.4.0-release
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/Menu.js | 4 | ||||
-rw-r--r-- | src/lib/TouchBar.js | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/Menu.js b/src/lib/Menu.js index f223283f9..d7398a126 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js | |||
@@ -730,7 +730,9 @@ export default class FranzMenu { | |||
730 | // need to clone object so we don't modify computed (cached) object | 730 | // need to clone object so we don't modify computed (cached) object |
731 | const serviceTpl = Object.assign([], this.serviceTpl()); | 731 | const serviceTpl = Object.assign([], this.serviceTpl()); |
732 | 732 | ||
733 | if (window.ferdi === undefined) { | 733 | // Don't initialize when window.franz is undefined or when we are on a payment window route |
734 | if (window.ferdi === undefined || this.stores.router.location.pathname.startsWith('/payment/')) { | ||
735 | console.log('skipping menu init'); | ||
734 | return; | 736 | return; |
735 | } | 737 | } |
736 | 738 | ||
diff --git a/src/lib/TouchBar.js b/src/lib/TouchBar.js index 1de46d2a3..32f546644 100644 --- a/src/lib/TouchBar.js +++ b/src/lib/TouchBar.js | |||
@@ -24,6 +24,10 @@ export default class FranzTouchBar { | |||
24 | _build() { | 24 | _build() { |
25 | const currentWindow = remote.getCurrentWindow(); | 25 | const currentWindow = remote.getCurrentWindow(); |
26 | 26 | ||
27 | if (this.stores.router.location.pathname.startsWith('/payment/')) { | ||
28 | return; | ||
29 | } | ||
30 | |||
27 | if (this.stores.user.isLoggedIn) { | 31 | if (this.stores.user.isLoggedIn) { |
28 | const { TouchBar } = remote; | 32 | const { TouchBar } = remote; |
29 | const { TouchBarButton, TouchBarSpacer } = TouchBar; | 33 | const { TouchBarButton, TouchBarSpacer } = TouchBar; |