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

[#1465] add member modals back in. Not all info is present, just a bit more

Browse Source 
work. Can now click guild & tavern members! does lazy-loading of members
so we don't have to load all their information at once
This commit is contained in:
Tyler Renelle
2013-09-07 12:45:39 -04:00
parent 28e2cb32f2
commit 91d1cdf361
17 changed files with 229 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,17 +1,38 @@
"use strict";
habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Groups', '$http', 'API_URL', '$q', 'User',
function($scope, $rootScope, Groups, $http, API_URL, $q, User) {
habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Groups', '$http', 'API_URL', '$q', 'User', 'Members', '$location',
function($scope, $rootScope, Groups, $http, API_URL, $q, User, Members, $location) {
$scope.isMember = function(user, group){
return ~(group.members.indexOf(user._id));
}
$scope.groups = Groups.groups;
// ------ Loading ------
$scope.groups = Groups.groups;
$scope.fetchGuilds = Groups.fetchGuilds;
$scope.fetchTavern = Groups.fetchTavern;
// ------ Modals ------
$scope.clickMember = function(uid) {
if (User.user._id == uid) {
if ($location.path() == '/tasks') {
$location.path('/options');
} else {
$location.path('/tasks');
}
} else {
// We need the member information up top here, but then we pass it down to the modal controller
// down below. Better way of handling this?
debugger
Members.selectMember(uid);
$rootScope.modals.member = true;
}
}
// ------ Invites ------
$scope.invitee = '';
$scope.invite = function(group, uuid){
group.$invite({uuid:uuid}, function(){
@@ -22,6 +43,15 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Groups', '$http', 'A
}
])
.controller("MemberModalCtrl", ['$scope', '$rootScope', 'Members',
function($scope, $rootScope, Members) {
// We watch Members.selectedMember because it's asynchronously set, so would be a hassle to handle updates here
$scope.$watch( function() { return Members.selectedMember; }, function (member) {
$scope.profile = member;
});
}
])
.controller('ChatCtrl', ['$scope', 'Groups', 'User', function($scope, Groups, User){
$scope._chatMessage = '';
$scope.postChat = function(group, message){