[#1221] misc bug fixes on backer.* doesn't exist in chat, default backer &

preference attrs in user model
This commit is contained in:
Tyler Renelle
2013-09-13 15:10:47 -04:00
parent 0d8e1f2043
commit dc303f83c1
3 changed files with 18 additions and 19 deletions

View File

@@ -89,6 +89,7 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Groups', '$http', 'A
} }
$scope.nameTagClasses = function(message){ $scope.nameTagClasses = function(message){
if (!message) return; // fixme what's triggering this?
if (message.contributor) { if (message.contributor) {
if (message.contributor.match(/npc/i) || message.contributor.match(/royal/i)) { if (message.contributor.match(/npc/i) || message.contributor.match(/royal/i)) {
return 'label-royal'; return 'label-royal';

View File

@@ -124,7 +124,7 @@ angular.module('userServices', []).
settings.auth.apiToken = token; settings.auth.apiToken = token;
settings.online = true; settings.online = true;
if (user && user._v) user._v--; // shortcut to always fetch new updates on page reload if (user && user._v) user._v--; // shortcut to always fetch new updates on page reload
this.log({}, cb); userServices.log({}, cb);
} else { } else {
alert('Please enter your ID and Token in settings.') alert('Please enter your ID and Token in settings.')
} }
@@ -155,17 +155,16 @@ angular.module('userServices', []).
var log = { op: 'set', data: {} }; var log = { op: 'set', data: {} };
window.habitrpgShared.helpers.dotSet(k, v, this.user); window.habitrpgShared.helpers.dotSet(k, v, this.user);
log.data[k] = v; log.data[k] = v;
this.log(log); userServices.log(log);
}, },
setMultiple: function(obj){ setMultiple: function(obj){
var self = this;
var log = { op: 'set', data: {} }; var log = { op: 'set', data: {} };
_.each(obj, function(v,k){ _.each(obj, function(v,k){
window.habitrpgShared.helpers.dotSet(k, v, self.user); window.habitrpgShared.helpers.dotSet(k, v, userServices.user);
log.data[k] = v; log.data[k] = v;
}); });
self.log(log); userServices.log(log);
}, },
save: save, save: save,

View File

@@ -42,15 +42,14 @@ var UserSchema = new Schema({
loggedin: Date loggedin: Date
} }
}, },
/* TODO*/
backer: Schema.Types.Mixed, backer: {
/* tier: Number,
# tier: Number admin: Boolean,
# admin: Boolean npc: String,
# contributor: Boolean contributor: String,
# tokensApplieds: Boolean tokensApplied: Boolean
*/ },
balance: Number, balance: Number,
habitIds: Array, habitIds: Array,
@@ -155,12 +154,12 @@ var UserSchema = new Schema({
}, },
preferences: { preferences: {
armorSet: String, armorSet: String,
dayStart: Number, dayStart: {type:Number, 'default': 0},
gender: String, gender: {type:String, 'default': 'm'},
hair: String, hair: {type:String, 'default':'blond'},
hideHeader: Boolean, hideHeader: {type:Boolean, 'default':false},
showHelm: Boolean, showHelm: {type:Boolean, 'default':true},
skin: String, skin: {type:String, 'default':'white'},
timezoneOffset: Number timezoneOffset: Number
}, },
profile: { profile: {