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

feat: Show loading state on party page when party isn't ready

Browse Source
This commit is contained in:
Blade Barringer
2016-05-23 07:15:46 -05:00
parent 0d2aa4e43a
commit 0b87777e26
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
website/client/js/controllers/partyCtrl.js
View File

@@ -21,6 +21,7 @@ habitrpg.controller("PartyCtrl", ['$rootScope','$scope','Groups','Chat','User','
}
if ($state.is('options.social.party') && $rootScope.party) {
$scope.group = {loadingParty: true}
Groups.party(true).then(handlePartyResponse, handlePartyError);
} else {
Groups.Group.syncParty().then(handlePartyResponse, handlePartyError);
@@ -47,6 +48,8 @@ habitrpg.controller("PartyCtrl", ['$rootScope','$scope','Groups','Chat','User','
}
$scope.create = function(group) {
group.loadingParty = true;
if (!group.name) group.name = env.t('possessiveParty', {name: User.user.profile.name});
Groups.Group.create(group)
.then(function(response) {
@@ -141,7 +144,7 @@ habitrpg.controller("PartyCtrl", ['$rootScope','$scope','Groups','Chat','User','
Groups.Group.leave(Groups.data.party._id, false)
.then(function() {
$rootScope.party = $scope.group = {
loadingNewParty: true
loadingParty: true
};
$scope.join({ id: newPartyId, name: newPartyName });
});