From 95542cd42eab3c0ee66546a5f6a544dfb2ad9656 Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Wed, 18 May 2016 17:16:40 +0200 Subject: [PATCH] v3 client: fix sticky header --- website/client/js/controllers/rootCtrl.js | 1 + website/client/js/services/memberServices.js | 6 +++--- website/client/js/services/userServices.js | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/website/client/js/controllers/rootCtrl.js b/website/client/js/controllers/rootCtrl.js index b4fee4076a..1d6bb3a5bb 100644 --- a/website/client/js/controllers/rootCtrl.js +++ b/website/client/js/controllers/rootCtrl.js @@ -8,6 +8,7 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$ var user = User.user; var initSticky = _.once(function(){ + console.log('here', User.user.preferences.stickyHeader); if (window.env.IS_MOBILE || User.user.preferences.stickyHeader === false) return; $('.header-wrap').sticky({topSpacing:0}); }) diff --git a/website/client/js/services/memberServices.js b/website/client/js/services/memberServices.js index c62e4cdbc2..2ecdd24b69 100644 --- a/website/client/js/services/memberServices.js +++ b/website/client/js/services/memberServices.js @@ -84,7 +84,7 @@ angular.module('habitrpg') fetchMember(uid) .then(function (response) { var member = response.data.data; - addToMembersList(member, self); // lazy load for later + addToMembersList(member); // lazy load for later _prepareMember(member, self); deferred.resolve(); }); @@ -95,7 +95,7 @@ angular.module('habitrpg') function addToMembersList (member, self) { if (member._id) { - self.members[member._id] = member; + members[member._id] = member; } } @@ -105,7 +105,7 @@ angular.module('habitrpg') function _prepareMember(member, self) { Shared.wrap(member, false); - self.selectedMember = self.members[member._id]; + self.selectedMember = members[member._id]; } $rootScope.$on('userUpdated', function(event, user){ diff --git a/website/client/js/services/userServices.js b/website/client/js/services/userServices.js index ec373ce1d2..14362b9a1f 100644 --- a/website/client/js/services/userServices.js +++ b/website/client/js/services/userServices.js @@ -84,6 +84,8 @@ angular.module('habitrpg') _.extend(user, response.data.data); + $rootScope.$emit('userUpdated', user); + if (!user._wrapped) { // This wraps user with `ops`, which are functions shared both on client and mobile. When performed on client, // they update the user in the browser and then send the request to the server, where the same operation is