Merge branch 'develop' into publish-debug

1 files changed, 19 insertions, 18 deletions

diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index a858ec993..6167f1c59 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -396,10 +396,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);
         },
       },
       {
@@ -407,10 +407,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);
         },
       },
       {
@@ -602,10 +602,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);
         },
       },
       {
@@ -613,10 +613,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);
         },
       },
       {
@@ -804,7 +804,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({
@@ -967,7 +967,8 @@ export default class FranzMenu {
 
     this.currentTemplate = tpl;
     const menu = Menu.buildFromTemplate(tpl);
-    Menu.setApplicationMenu(menu);
+    const lockedMenu = Menu.buildFromTemplate([]);
+    Menu.setApplicationMenu(this.stores.user.isLoggedIn && this.stores.settings.app.locked ? lockedMenu : menu);
   }
 
   serviceTpl() {