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

solve conflict

Browse Source
This commit is contained in:
Matteo Pagliazzi
2013-11-08 17:05:03 +01:00
parent a78297f129 06d1f77ce5
commit 02651d52a4
22 changed files with 266 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
public/js/controllers/adminCtrl.js Normal file
View File

@@ -0,0 +1,16 @@
"use strict";
habitrpg.controller("AdminCtrl", ['$scope', '$rootScope', 'User', 'Members', 'Notification',
function($scope, $rootScope, User, Members, Notification) {
$scope.profile = undefined;
$scope.loadUser = function(uuid){
$scope.profile = Members.Member.get({uid:uuid});
}
$scope.save = function(profile) {
profile.$save(function(){
Notification.text("User updated");
$scope.profile = undefined;
$scope._uuid = undefined;
})
}
}])

21
public/js/controllers/groupsCtrl.js
View File

@@ -101,7 +101,7 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Groups', '$http', 'A
}
$scope.deleteChatMessage = function(group, message){
if(message.uuid === User.user.id || (User.user.backer && User.user.backer.admin)){
if(message.uuid === User.user.id || (User.user.backer && User.user.contributor.admin)){
var previousMsg = (group.chat && group.chat[0]) ? group.chat[0].id : false;
Groups.Group.deleteChatMessage({gid:group._id, messageId:message.id, previousMsg:previousMsg}, undefined, function(data){
if(data.chat) group.chat = data.chat;
@@ -116,22 +116,6 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Groups', '$http', 'A
group.$get();
}
$scope.nameTagClasses = function(message){
if (!message) return; // fixme what's triggering this?
if (message.contributor) {
if (message.contributor.match(/npc/i) || message.contributor.match(/royal/i)) {
return 'label-royal';
} else if (message.contributor.match(/champion/i)) {
return 'label-champion';
} else if (message.contributor.match(/elite/i)) {
return 'label-success'; //elite
}
}
if (message.uuid == User.user.id) {
return 'label-inverse'; //self
}
}
}])
.controller("GuildsCtrl", ['$scope', 'Groups', 'User', '$rootScope', '$state', '$location',
@@ -249,5 +233,8 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Groups', '$http', 'A
User.user.flags.rest = !User.user.flags.rest;
User.log({op:'set',data:{'flags.rest':User.user.flags.rest}});
}
$scope.toggleUserTier = function($event) {
$($event.target).next().toggle();
}
}
])

10
public/js/controllers/rootCtrl.js
View File

@@ -75,6 +75,16 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$
});
}
$scope.contribText = function(contrib, backer){
if (!contrib && !backer) return;
if (backer && backer.npc) return backer.npc;
var l = contrib && contrib.level;
if (l && l > 0) {
var level = (l < 3) ? 'Friend' : (l < 5) ? 'Elite' : (l < 7) ? 'Champion' : (l < 8) ? 'Legendary' : 'Heroic';
return level + ' ' + contrib.text;
}
}
$rootScope.charts = {};
$rootScope.toggleChart = function(id, task) {
var history = [], matrix, data, chart, options;

2
public/js/controllers/settingsCtrl.js
View File

@@ -64,7 +64,7 @@ habitrpg.controller('SettingsCtrl',
if(value === true){
$scope.restoreValues.stats = angular.copy(User.user.stats);
$scope.restoreValues.items = angular.copy(User.user.items);
$scope.restoreValues.achievements = {streak: User.user.achievements.streak};
$scope.restoreValues.achievements = {streak: User.user.achievements.streak || 0};
}
})