diff --git a/src/app/components/store.js b/src/app/components/store.js index b9006f6e37d..84e72b96314 100644 --- a/src/app/components/store.js +++ b/src/app/components/store.js @@ -8,9 +8,15 @@ define([], function() { set: function(key, value) { window.localStorage[key] = value; }, - getBool: function(key) { + getBool: function(key, def) { + if (def !== void 0 && !this.exists(key)) { + return def; + } return window.localStorage[key] === 'true' ? true : false; }, + exists: function(key) { + return window.localStorage[key] !== void 0; + }, delete: function(key) { window.localStorage.removeItem(key); } diff --git a/src/app/controllers/grafanaCtrl.js b/src/app/controllers/grafanaCtrl.js index 3352e1a672e..130e07ead8d 100644 --- a/src/app/controllers/grafanaCtrl.js +++ b/src/app/controllers/grafanaCtrl.js @@ -42,13 +42,14 @@ function (angular, config, _, $, store) { } $scope.onAppEvent('logged-out', function() { - $scope.showProSideMenu = false; + $scope.grafana.sidemenu = false; $scope.grafana.user = {}; }); $scope.onAppEvent('logged-in', function(evt, user) { - $scope.grafana.sidemenu = store.getBool('grafana.sidemenu'); + $scope.grafana.sidemenu = store.getBool('grafana.sidemenu', true); $scope.grafana.user = user; + store.set('grafana.sidemenu', $scope.grafana.sidemenu); }); }; @@ -56,7 +57,7 @@ function (angular, config, _, $, store) { $controller('DashboardCtrl', { $scope: viewScope }).init(dashboardData); }; - $scope.toggleProSideMenu = function() { + $scope.toggleSideMenu = function() { $scope.grafana.sidemenu = !$scope.grafana.sidemenu; store.set('grafana.sidemenu', $scope.grafana.sidemenu); }; diff --git a/src/app/partials/dashboard_topnav.html b/src/app/partials/dashboard_topnav.html index dc517578774..812ace5e6e6 100644 --- a/src/app/partials/dashboard_topnav.html +++ b/src/app/partials/dashboard_topnav.html @@ -2,7 +2,7 @@