From 207975f5928a66cbb5f580d999c32e5aacd98d15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Jones?= Date: Wed, 18 Jun 2014 00:02:35 -0300 Subject: [PATCH 1/5] Update settings.jade --- views/options/settings.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/options/settings.jade b/views/options/settings.jade index 7aa325c224..7c3e63c9e0 100644 --- a/views/options/settings.jade +++ b/views/options/settings.jade @@ -38,7 +38,7 @@ script(type='text/ng-template', id='partials/options.settings.settings.html') 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 @@ -203,4 +203,4 @@ script(id='partials/options.settings.subscription.html',type='text/ng-template') |   span.glyphicon.glyphicon-ok div(ng-include="'partials/options.settings.subscription.perks.html'") - .btn.btn-sm.btn-danger(ng-if='!user.purchased.plan.dateTerminated', ng-click='cancelSubscription()')=env.t('cancelSub') \ No newline at end of file + .btn.btn-sm.btn-danger(ng-if='!user.purchased.plan.dateTerminated', ng-click='cancelSubscription()')=env.t('cancelSub') From f7727eef237ae03e8f2c45f5fce5d63ecf61b9ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Jones?= Date: Wed, 18 Jun 2014 00:03:21 -0300 Subject: [PATCH 2/5] Update settingsCtrl.js --- public/js/controllers/settingsCtrl.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/public/js/controllers/settingsCtrl.js b/public/js/controllers/settingsCtrl.js index 5bbb13be86..27bb77ddd2 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(); From 9f8baa617eb52a2aaabc9082b8cfce0cb17a8457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Jones?= Date: Wed, 18 Jun 2014 00:03:45 -0300 Subject: [PATCH 3/5] Update settingsCtrl.js --- public/js/controllers/settingsCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/controllers/settingsCtrl.js b/public/js/controllers/settingsCtrl.js index 27bb77ddd2..5c41a9f879 100644 --- a/public/js/controllers/settingsCtrl.js +++ b/public/js/controllers/settingsCtrl.js @@ -15,7 +15,7 @@ habitrpg.controller('SettingsCtrl', // }); // } - $scope.hideHeader = function(){ + $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}); From 9f6e6af5c7a59774adbed96868859de10bd519b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Jones?= Date: Wed, 18 Jun 2014 00:10:48 -0300 Subject: [PATCH 4/5] Update settings.jade --- views/options/settings.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/options/settings.jade b/views/options/settings.jade index 7c3e63c9e0..6a6be6a801 100644 --- a/views/options/settings.jade +++ b/views/options/settings.jade @@ -34,7 +34,7 @@ script(type='text/ng-template', id='partials/options.settings.settings.html') .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 From 272b71fc1176c62e400bb4a366a7ff4a052abd6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Jones?= Date: Sun, 22 Jun 2014 13:45:27 -0300 Subject: [PATCH 5/5] Update settings.jade --- views/options/settings.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/options/settings.jade b/views/options/settings.jade index 6a6be6a801..b9ac733026 100644 --- a/views/options/settings.jade +++ b/views/options/settings.jade @@ -34,7 +34,7 @@ script(type='text/ng-template', id='partials/options.settings.settings.html') .checkbox label - input(type='checkbox', ng-click='hideHeader()', 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