sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-14 07:52:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'refs/remotes/nmjones/develop' into develop

Browse source 
Conflicts:
	views/options/settings.jade
This commit is contained in:
Tyler Renelle 2014-08-23 16:05:17 -06:00
commit 184e145914
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
public/js/controllers/settingsCtrl.js
View file

@ -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();

4
views/options/settings.jade
View file

@ -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