diff options
author | Vijay A <avijayr@protonmail.com> | 2021-07-17 20:32:22 +0530 |
---|---|---|
committer | Vijay Raghavan Aravamudhan <vraravam@users.noreply.github.com> | 2021-07-20 16:02:15 +0000 |
commit | 45373f655f68fdd0b320cde175b6108454ad4731 (patch) | |
tree | c1ccb0c73639d754b68a36a1977b74471fe4b566 /src/lib | |
parent | New Crowdin updates (#1668) (diff) | |
download | ferdium-app-45373f655f68fdd0b320cde175b6108454ad4731.tar.gz ferdium-app-45373f655f68fdd0b320cde175b6108454ad4731.tar.zst ferdium-app-45373f655f68fdd0b320cde175b6108454ad4731.zip |
Removed Franz paid plans features:
- serviceLimit
- planSelection
- trialStatusBar
and other Franz features that were for different tiers of subscription.
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/Menu.js | 24 | ||||
-rw-r--r-- | src/lib/TouchBar.js | 4 |
2 files changed, 11 insertions, 17 deletions
diff --git a/src/lib/Menu.js b/src/lib/Menu.js index c60536f0c..756b256fb 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js | |||
@@ -831,8 +831,8 @@ export default class FranzMenu { | |||
831 | // need to clone object so we don't modify computed (cached) object | 831 | // need to clone object so we don't modify computed (cached) object |
832 | const serviceTpl = Object.assign([], this.serviceTpl()); | 832 | const serviceTpl = Object.assign([], this.serviceTpl()); |
833 | 833 | ||
834 | // Don't initialize when window.franz is undefined or when we are on a payment window route | 834 | // Don't initialize when window.ferdi is undefined |
835 | if (window.ferdi === undefined || this.stores.router.location.pathname.startsWith('/payment/')) { | 835 | if (window.ferdi === undefined) { |
836 | console.log('skipping menu init'); | 836 | console.log('skipping menu init'); |
837 | return; | 837 | return; |
838 | } | 838 | } |
@@ -1219,17 +1219,15 @@ export default class FranzMenu { | |||
1219 | }); | 1219 | }); |
1220 | 1220 | ||
1221 | // Workspace items | 1221 | // Workspace items |
1222 | if (this.stores.user.isPremium) { | 1222 | workspaces.forEach((workspace, i) => menu.push({ |
1223 | workspaces.forEach((workspace, i) => menu.push({ | 1223 | label: workspace.name, |
1224 | label: workspace.name, | 1224 | accelerator: i < 9 ? `${cmdKey}+Alt+${i + 1}` : null, |
1225 | accelerator: i < 9 ? `${cmdKey}+Alt+${i + 1}` : null, | 1225 | type: 'radio', |
1226 | type: 'radio', | 1226 | checked: activeWorkspace ? workspace.id === activeWorkspace.id : false, |
1227 | checked: activeWorkspace ? workspace.id === activeWorkspace.id : false, | 1227 | click: () => { |
1228 | click: () => { | 1228 | workspaceActions.activate({ workspace }); |
1229 | workspaceActions.activate({ workspace }); | 1229 | }, |
1230 | }, | 1230 | })); |
1231 | })); | ||
1232 | } | ||
1233 | 1231 | ||
1234 | return menu; | 1232 | return menu; |
1235 | } | 1233 | } |
diff --git a/src/lib/TouchBar.js b/src/lib/TouchBar.js index 781cd0895..3397afdb2 100644 --- a/src/lib/TouchBar.js +++ b/src/lib/TouchBar.js | |||
@@ -23,10 +23,6 @@ export default class FranzTouchBar { | |||
23 | _build() { | 23 | _build() { |
24 | const currentWindow = getCurrentWindow(); | 24 | const currentWindow = getCurrentWindow(); |
25 | 25 | ||
26 | if (this.stores.router.location.pathname.startsWith('/payment/')) { | ||
27 | return; | ||
28 | } | ||
29 | |||
30 | if (this.stores.user.isLoggedIn) { | 26 | if (this.stores.user.isLoggedIn) { |
31 | const { TouchBarButton, TouchBarSpacer } = TouchBar; | 27 | const { TouchBarButton, TouchBarSpacer } = TouchBar; |
32 | 28 | ||