diff --git a/app/scripts/main-header/main-header-d.html b/app/scripts/main-header/main-header-d.html index 51cde4ecb7..74be6d272c 100644 --- a/app/scripts/main-header/main-header-d.html +++ b/app/scripts/main-header/main-header-d.html @@ -8,15 +8,19 @@ aria-label="cloud"> - - - - {{project.title}} - - + + + {{ vm.r.currentProject.title }} + + + + + {{project.title}} + + + +

SuperProductivity diff --git a/app/scripts/main-header/main-header-d.js b/app/scripts/main-header/main-header-d.js index c25c4f1db3..41c81efd62 100644 --- a/app/scripts/main-header/main-header-d.js +++ b/app/scripts/main-header/main-header-d.js @@ -32,6 +32,11 @@ vm.allProjects = Projects.getList(); + + this.openMenu = function($mdOpenMenu, ev) { + $mdOpenMenu(ev); + }; + vm.openAddTask = () => { Dialogs('ADD_TASK'); }; diff --git a/app/scripts/routes/settings/settings-c.js b/app/scripts/routes/settings/settings-c.js index dc5cb23dbc..af082ee67c 100644 --- a/app/scripts/routes/settings/settings-c.js +++ b/app/scripts/routes/settings/settings-c.js @@ -50,6 +50,14 @@ $rootScope.r[key] = $localStorage[key] = val; }); + // delete projects and current project if there are non yet + if (!settings.currentProject) { + $localStorage.currentProject = $rootScope.r.currentProject = undefined; + } + if (!settings.projects) { + $localStorage.projects = $rootScope.r.projects = []; + } + $mdToast.show($mdToast.simple() .textContent('Settings successfully imported') .position('bottom'));