krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 23:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

New Party Loading Messages (#7862)

Browse Source 
* add basic party loading message code; doesn't work yet

* fixup party loading messages, remove rpg-style messages

* move party-loading messages back into groups.json

* party-loading message logic returns a string instead of a number
This commit is contained in:
Kaitlin Hipkin
2016-08-12 09:53:03 -04:00
committed by Blade Barringer
parent 7ccbcd7b33
commit 55111a6ddc
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,15 +3,21 @@
habitrpg.controller("PartyCtrl", ['$rootScope','$scope','Groups','Chat','User','Challenges','$state','$compile','Analytics','Quests','Social', 'Pusher',
function($rootScope, $scope, Groups, Chat, User, Challenges, $state, $compile, Analytics, Quests, Social, Pusher) {
var PARTY_LOADING_MESSAGES = 4;
var user = User.user;
$scope.type = 'party';
$scope.text = window.env.t('party');
$scope.group = {loadingParty: true}
$scope.group = {loadingParty: true};
$scope.inviteOrStartParty = Groups.inviteOrStartParty;
$scope.loadWidgets = Social.loadWidgets;
// Random message between 1 and PARTY_LOADING_MESSAGES
var partyMessageNumber = Math.floor(Math.random() * PARTY_LOADING_MESSAGES) + 1;
$scope.partyLoadingMessage = window.env.t('partyLoading' + partyMessageNumber);
function handlePartyResponse (group) {
$rootScope.party = $scope.group = group;
checkForNotifications();