From 92d315af3f62d068b8e954860ecec19be30a6398 Mon Sep 17 00:00:00 2001
From: fnuesse <felix.nuesse@t-online.de>
Date: Thu, 15 Nov 2018 15:26:11 +0100
Subject: [PATCH] Hid Vaultservicebug when editing was canceled

Signed-off-by: fnuesse <felix.nuesse@t-online.de>
---
 js/app/controllers/menu.js | 25 ++++++++-----------------
 sass/menu.scss             |  3 +++
 templates/main.php         |  6 +++---
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/js/app/controllers/menu.js b/js/app/controllers/menu.js
index 6058b39d..61c30575 100644
--- a/js/app/controllers/menu.js
+++ b/js/app/controllers/menu.js
@@ -176,28 +176,19 @@
                 };
 
 
+                $scope.legacyNavbarDefault=true;
+                $scope.legacyNavbar = $scope.legacyNavbarDefault;
+                $scope.$watch('legacyNavbar', function(newValue, oldValue) {
+                    VaultService.setVaultSetting("vaultNavBarLegacy",newValue);
+                });
 
-                $scope.legacyNavbar = VaultService.getVaultSetting("vaultTagCollapsedState",false);
-                $scope.legacyNavbarChecked = function () {
-                    if (VaultService.getVaultSetting("vaultNavBarLegacy",false)) {
-                        VaultService.setVaultSetting("vaultNavBarLegacy",false);
-                    } else {
-                        VaultService.setVaultSetting("vaultNavBarLegacy",true);
-                    }
-                    $scope.legacyNavbar=VaultService.getVaultSetting("vaultNavBarLegacy",false);
+                $scope.initializeNavbar = function () {
+                    $scope.legacyNavbar = VaultService.getVaultSetting('vaultNavBarLegacy',$scope.legacyNavbarDefault);
                 };
 
-                $scope.legacyNavbarCheckedState = function () {
-                    $scope.legacyNavbar=VaultService.getVaultSetting("vaultNavBarLegacy",false);
-                    if($scope.legacyNavbar){
-                        return true;
-                    }
-                    return false;
-                };
-
-
 				$rootScope.$on('credentials_loaded', function () {
 					$rootScope.$broadcast('selected_tags_updated', $scope.selectedTags);
+                    $scope.initializeNavbar();
 				});
 
 				$scope.available_tags = TagService.getTags();
diff --git a/sass/menu.scss b/sass/menu.scss
index 00cee966..ca130af2 100644
--- a/sass/menu.scss
+++ b/sass/menu.scss
@@ -125,6 +125,9 @@
   }
 }
 
+.hidden-list{
+  display: none !important;
+}
 
 //source https://material.io/tools/icons/?icon=restore&style=baseline
 .icon-expired{
diff --git a/templates/main.php b/templates/main.php
index 86353696..db3ee672 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -125,7 +125,7 @@ style('passman', 'app');
     </div>
 
     <div id="app-navigation" ng-if="selectedVault" ng-controller="MenuCtrl">
-        <ul class="with-icon" ng-hide="legacyNavbarCheckedState()">
+        <ul class="with-icon" ng-class="{ 'hidden-list': !legacyNavbar }" >
 
             <li>
                 <a ng-class="{selected: clickedNavigationItem=='all'}" class="icon-toggle svg" ng-click="filterCredentialBySpecial('all')">{{ 'navigation.show.all' | translate }}</a>
@@ -173,7 +173,7 @@ style('passman', 'app');
                 </a>
             </li>
         </ul >
-        <ul class="with-icon" ng-hide="!legacyNavbarCheckedState()">
+        <ul class="with-icon hidden-list" ng-class="{ 'hidden-list': legacyNavbar }">
             <li class="taginput">
                 <a class="taginput icon-search">
                     <tags-input ng-model="selectedTags" replace-spaces-with-dashes="false" placeholder="{{ 'navigation.advanced.filter' | translate }}">
@@ -201,7 +201,7 @@ style('passman', 'app');
             <div id="app-settings-content" class="hide-animation" ng-hide="!settingsShown">
 
                 <div class="settings-container-label">
-                    <input class="checkbox" id="navbarLegacyMode" type="checkbox" ng-model="legacyNavbar" ng-change="legacyNavbarChecked()">
+                    <input class="checkbox" id="navbarLegacyMode" type="checkbox" ng-model="legacyNavbar">
                     <label for="navbarLegacyMode">{{'navigation.advanced.checkbox' | translate }}</label>
                 </div>