From 9214b63967ca659fb083d9c994842995aef126f6 Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Tue, 26 Nov 2019 23:31:36 +0700 Subject: #168 Set empty menu when Ferdi is locked --- src/lib/Menu.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/lib/Menu.js') diff --git a/src/lib/Menu.js b/src/lib/Menu.js index 826fe843f..d3b13e491 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js @@ -809,6 +809,7 @@ export default class FranzMenu { locked: false, }, }); + window.ferdi.menu.rebuild() setTimeout(() => { actions.settings.update({ type: 'app', @@ -963,7 +964,8 @@ export default class FranzMenu { this.currentTemplate = tpl; const menu = Menu.buildFromTemplate(tpl); - Menu.setApplicationMenu(menu); + const lockedMenu = Menu.buildFromTemplate([]); + Menu.setApplicationMenu(this.stores.settings.app.locked ? lockedMenu : menu); } serviceTpl() { -- cgit v1.2.3-54-g00ecf From e14638f2d0db12369b5de477cdc06511bbbfb6d7 Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Wed, 27 Nov 2019 16:08:15 +0700 Subject: Run prepare code to fix formatting --- src/components/settings/settings/EditSettingsForm.js | 18 ++++++++++++------ src/components/settings/team/TeamDashboard.js | 9 ++++++--- src/lib/Menu.js | 2 +- 3 files changed, 19 insertions(+), 10 deletions(-) (limited to 'src/lib/Menu.js') diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 12822bae0..1a54f221d 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js @@ -261,9 +261,12 @@ export default @observer class EditSettingsForm extends Component { autoFocus /> {isLoggedIn && ( -

+

{ intl.formatMessage(messages.serverInfo) }

)} @@ -301,9 +304,12 @@ export default @observer class EditSettingsForm extends Component { onChange={e => this.submit(e)} field={form.$('todoServer')} /> -

+

{ intl.formatMessage(messages.todoServerInfo) }

diff --git a/src/components/settings/team/TeamDashboard.js b/src/components/settings/team/TeamDashboard.js index 57db1dcbd..3d5358d89 100644 --- a/src/components/settings/team/TeamDashboard.js +++ b/src/components/settings/team/TeamDashboard.js @@ -210,9 +210,12 @@ export default @injectSheet(styles) @observer class TeamDashboard extends Compon

{intl.formatMessage(messages.teamsUnavailable)}

-

+

{intl.formatMessage(messages.teamsUnavailableInfo)}

diff --git a/src/lib/Menu.js b/src/lib/Menu.js index d3b13e491..b8abf80bd 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js @@ -809,7 +809,7 @@ export default class FranzMenu { locked: false, }, }); - window.ferdi.menu.rebuild() + window.ferdi.menu.rebuild(); setTimeout(() => { actions.settings.update({ type: 'app', -- cgit v1.2.3-54-g00ecf From a28c993d2045c3bef61a4435737e0c810d380282 Mon Sep 17 00:00:00 2001 From: vantezzen Date: Sat, 26 Oct 2019 12:48:31 +0200 Subject: Fix zoom not working --- src/lib/Menu.js | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'src/lib/Menu.js') diff --git a/src/lib/Menu.js b/src/lib/Menu.js index b8abf80bd..fb4ed2677 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js @@ -392,10 +392,10 @@ const _templateFactory = intl => [ accelerator: 'Cmd+plus', click() { const activeService = getActiveWebview(); - activeService.getZoomLevel((level) => { - // level 9 =~ +300% and setZoomLevel wouldnt zoom in further - if (level < 9) activeService.setZoomLevel(level + 1); - }); + const level = activeService.getZoomLevel(); + + // level 9 =~ +300% and setZoomLevel wouldnt zoom in further + if (level < 9) activeService.setZoomLevel(level + 1); }, }, { @@ -403,10 +403,10 @@ const _templateFactory = intl => [ accelerator: 'Cmd+-', click() { const activeService = getActiveWebview(); - activeService.getZoomLevel((level) => { - // level -9 =~ -50% and setZoomLevel wouldnt zoom out further - if (level > -9) activeService.setZoomLevel(level - 1); - }); + const level = activeService.getZoomLevel(); + + // level -9 =~ -50% and setZoomLevel wouldnt zoom out further + if (level > -9) activeService.setZoomLevel(level - 1); }, }, { @@ -598,10 +598,10 @@ const _titleBarTemplateFactory = intl => [ accelerator: `${ctrlKey}+=`, click() { const activeService = getActiveWebview(); - activeService.getZoomLevel((level) => { - // level 9 =~ +300% and setZoomLevel wouldnt zoom in further - if (level < 9) activeService.setZoomLevel(level + 1); - }); + const level = activeService.getZoomLevel(); + + // level 9 =~ +300% and setZoomLevel wouldnt zoom in further + if (level < 9) activeService.setZoomLevel(level + 1); }, }, { @@ -609,10 +609,10 @@ const _titleBarTemplateFactory = intl => [ accelerator: `${ctrlKey}+-`, click() { const activeService = getActiveWebview(); - activeService.getZoomLevel((level) => { - // level -9 =~ -50% and setZoomLevel wouldnt zoom out further - if (level > -9) activeService.setZoomLevel(level - 1); - }); + const level = activeService.getZoomLevel(); + + // level -9 =~ -50% and setZoomLevel wouldnt zoom out further + if (level > -9) activeService.setZoomLevel(level - 1); }, }, { -- cgit v1.2.3-54-g00ecf From 93d31fd9257c25ad218f0395a23473827a6f5ed1 Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Thu, 28 Nov 2019 02:35:09 +0700 Subject: Remove unnecessary call to window.ferdi.menu.rebuild --- src/lib/Menu.js | 1 - 1 file changed, 1 deletion(-) (limited to 'src/lib/Menu.js') diff --git a/src/lib/Menu.js b/src/lib/Menu.js index fb4ed2677..941107adb 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js @@ -809,7 +809,6 @@ export default class FranzMenu { locked: false, }, }); - window.ferdi.menu.rebuild(); setTimeout(() => { actions.settings.update({ type: 'app', -- cgit v1.2.3-54-g00ecf From b3c56428fa8fe15a35b70c5f5ca933ce2c0bba66 Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Fri, 29 Nov 2019 19:41:09 +0700 Subject: Prevent Password Lock to trigger while not logged in --- src/lib/Menu.js | 4 ++-- src/stores/SettingsStore.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/lib/Menu.js') diff --git a/src/lib/Menu.js b/src/lib/Menu.js index 941107adb..303845e55 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js @@ -800,7 +800,7 @@ export default class FranzMenu { }, { label: intl.formatMessage(menuItems.lockFerdi), accelerator: 'CmdOrCtrl+Shift+L', - enabled: this.stores.settings.app.lockingFeatureEnabled, + enabled: this.stores.user.isLoggedIn && this.stores.settings.app.lockingFeatureEnabled, click() { // Disable lock first - otherwise the application might not update correctly actions.settings.update({ @@ -964,7 +964,7 @@ export default class FranzMenu { this.currentTemplate = tpl; const menu = Menu.buildFromTemplate(tpl); const lockedMenu = Menu.buildFromTemplate([]); - Menu.setApplicationMenu(this.stores.settings.app.locked ? lockedMenu : menu); + Menu.setApplicationMenu(this.stores.user.isLoggedIn && this.stores.settings.app.locked ? lockedMenu : menu); } serviceTpl() { diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js index df0fc77e9..051e86be2 100644 --- a/src/stores/SettingsStore.js +++ b/src/stores/SettingsStore.js @@ -68,7 +68,6 @@ export default class SettingsStore extends Store { () => this.all.app.locked, () => { const { router } = window.ferdi.stores; - if (this.all.app.locked && this.all.app.lockingFeatureEnabled) { // App just got locked, redirect to unlock screen router.push('/auth/locked'); @@ -82,7 +81,8 @@ export default class SettingsStore extends Store { // Make sure to lock app on launch if locking feature is enabled setTimeout(() => { - if (this.all.app.lockingFeatureEnabled) { + const isLoggedIn = Boolean(localStorage.getItem('authToken')); + if (isLoggedIn && this.all.app.lockingFeatureEnabled) { // Disable lock first - otherwise the lock might not get activated corrently this.actions.settings.update({ type: 'app', -- cgit v1.2.3-54-g00ecf