diff --git a/common/locales/en/groups.json b/common/locales/en/groups.json index 1055e6b428..f1ed1cf67e 100644 --- a/common/locales/en/groups.json +++ b/common/locales/en/groups.json @@ -33,6 +33,7 @@ "invitedToNewParty": "You were invited to join a party! Do you want to leave this party and join <%= partyName %>?", "joinNewParty": "Join New Party", "declineInvitation": "Decline Invitation", + "loadingNewParty": "Your new party is loading. Please wait...", "newMsg": "New message in \"<%= name %>\"", "chat": "Chat", "sendChat": "Send Chat", diff --git a/website/public/js/controllers/partyCtrl.js b/website/public/js/controllers/partyCtrl.js index d288c0a57c..0e565d62c6 100644 --- a/website/public/js/controllers/partyCtrl.js +++ b/website/public/js/controllers/partyCtrl.js @@ -91,6 +91,9 @@ habitrpg.controller("PartyCtrl", ['$rootScope','$scope','Groups','Chat','User',' $scope.leaveOldPartyAndJoinNewParty = function(newPartyId, newPartyName) { if (confirm('Are you sure you want to delete your party and join ' + newPartyName + '?')) { Groups.Group.leave({gid: Groups.party()._id, keep:false}, undefined, function() { + $scope.group = { + loadingNewParty: true + }; $scope.join({ id: newPartyId, name: newPartyName }); }); } diff --git a/website/views/options/social/leave-party-and-join-another.jade b/website/views/options/social/leave-party-and-join-another.jade index 3a0ec1d8c4..438feb3786 100644 --- a/website/views/options/social/leave-party-and-join-another.jade +++ b/website/views/options/social/leave-party-and-join-another.jade @@ -1,5 +1,5 @@ - var newParty = 'User.user.invitations.party' -.containter-fulid(ng-if='#{newParty}.id && party._id') +.containter-fluid(ng-if='#{newParty}.id && party._id') .row.text-center .col-sm-6.col-sm-offset-3.alert.alert-warning p {{::env.t('invitedToNewParty', { partyName: #{newParty}.name })}} diff --git a/website/views/options/social/party.jade b/website/views/options/social/party.jade index f7580f1deb..8915354d1b 100644 --- a/website/views/options/social/party.jade +++ b/website/views/options/social/party.jade @@ -1,10 +1,16 @@ include ../../shared/avatar/generated_avatar script(type='text/ng-template', id='partials/options.social.party.html') + + .container-fluid(ng-if='group.loadingNewParty') + .row.text-center: .col-xs-12 + h2=env.t('loadingNewParty') + img(src='/page-loader.gif') + div(ng-if='group._id') include ./leave-party-and-join-another include ./group - div(ng-if='!group._id') + div(ng-if='!group._id && !group.loadingNewParty') div(ng-show='user.invitations.party.id').container-fluid h2=env.t('invitedTo', {name: '{{user.invitations.party.name}}'}) a.btn.btn-success(data-type='party', ng-click='join(user.invitations.party)')=env.t('accept')