krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 15:17:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

v3 client: fix sticky header

Browse Source
This commit is contained in:
Matteo Pagliazzi
2016-05-18 17:16:40 +02:00
parent 73dd9f5920
commit 95542cd42e
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
website/client/js/controllers/rootCtrl.js
View File

@@ -8,6 +8,7 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$
var user = User.user; var user = User.user;
var initSticky = _.once(function(){ var initSticky = _.once(function(){
console.log('here', User.user.preferences.stickyHeader);
if (window.env.IS_MOBILE || User.user.preferences.stickyHeader === false) return; if (window.env.IS_MOBILE || User.user.preferences.stickyHeader === false) return;
$('.header-wrap').sticky({topSpacing:0}); $('.header-wrap').sticky({topSpacing:0});
}) })

6
website/client/js/services/memberServices.js
View File

@@ -84,7 +84,7 @@ angular.module('habitrpg')
fetchMember(uid) fetchMember(uid)
.then(function (response) { .then(function (response) {
var member = response.data.data; var member = response.data.data;
addToMembersList(member, self); // lazy load for later addToMembersList(member); // lazy load for later
_prepareMember(member, self); _prepareMember(member, self);
deferred.resolve(); deferred.resolve();
}); });
@@ -95,7 +95,7 @@ angular.module('habitrpg')
function addToMembersList (member, self) { function addToMembersList (member, self) {
if (member._id) { if (member._id) {
self.members[member._id] = member; members[member._id] = member;
} }
} }
@@ -105,7 +105,7 @@ angular.module('habitrpg')
function _prepareMember(member, self) { function _prepareMember(member, self) {
Shared.wrap(member, false); Shared.wrap(member, false);
self.selectedMember = self.members[member._id]; self.selectedMember = members[member._id];
} }
$rootScope.$on('userUpdated', function(event, user){ $rootScope.$on('userUpdated', function(event, user){

2
website/client/js/services/userServices.js
View File

@@ -84,6 +84,8 @@ angular.module('habitrpg')
_.extend(user, response.data.data); _.extend(user, response.data.data);
$rootScope.$emit('userUpdated', user);
if (!user._wrapped) { if (!user._wrapped) {
// This wraps user with `ops`, which are functions shared both on client and mobile. When performed on client, // 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 // they update the user in the browser and then send the request to the server, where the same operation is