diff --git a/public/js/controllers/settingsCtrl.js b/public/js/controllers/settingsCtrl.js index bff15f4911..9b474d8bab 100644 --- a/public/js/controllers/settingsCtrl.js +++ b/public/js/controllers/settingsCtrl.js @@ -15,6 +15,16 @@ habitrpg.controller('SettingsCtrl', // }); // } + $scope.hideHeader = function(){ + User.set({"preferences.hideHeader":!User.user.preferences.hideHeader}) + if (User.user.preferences.hideHeader && User.user.preferences.stickyHeader){ + User.set({"preferences.stickyHeader":false}); + $rootScope.$on('userSynced', function(){ + window.location.reload(); + }); + } + } + $scope.toggleStickyHeader = function(){ $rootScope.$on('userSynced', function(){ window.location.reload(); diff --git a/views/options/settings.jade b/views/options/settings.jade index 12fa09d5dc..5d82f0918d 100644 --- a/views/options/settings.jade +++ b/views/options/settings.jade @@ -38,11 +38,11 @@ script(type='text/ng-template', id='partials/options.settings.settings.html') !=env.t('helpWithTranslation') .checkbox label - input(type='checkbox', ng-click='set({"preferences.hideHeader":user.preferences.hideHeader?false:true})', ng-checked='user.preferences.hideHeader!==true') + input(type='checkbox', ng-click='hideHeader() ', ng-checked='user.preferences.hideHeader!==true') span.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t('showHeaderPop'))=env.t('showHeader') .checkbox label - input(type='checkbox', ng-click='toggleStickyHeader()', ng-checked='user.preferences.stickyHeader!==false') + input(type='checkbox', ng-click='toggleStickyHeader()', ng-checked='user.preferences.stickyHeader!==false', ng-disabled="user.preferences.hideHeader!==false") span.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t('stickyHeaderPop'))=env.t('stickyHeader') .checkbox label