krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into paglias/realtime-chat-v1

Browse Source
This commit is contained in:
Matteo Pagliazzi
2016-09-08 19:12:05 +02:00
parent 136b4ada45 0c0f50f647
commit 6ba721998a
53 changed files with 272 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
website/client/js/services/pusherService.js
View File

@@ -70,7 +70,7 @@ angular.module('habitrpg')
// When the user correctly enters the party channel
partyChannel.bind('pusher:subscription_succeeded', function(pusherMembers) {
// Wait for the party to be loaded
Groups.party(reconnecting ? true : false).then(function (party) {
Groups.party(reconnecting).then(function (party) {
// If we just reconnected after some inactivity, sync the party
if (reconnecting === true) {
_.assign($rootScope.party, party);
@@ -182,6 +182,7 @@ angular.module('habitrpg')
partyId = user && $rootScope.user.party && $rootScope.user.party._id;
if (!partyId) return;
// See if another tab is already connected to Pusher
if (!localStorage.getItem(tabIdKey)) {
connectToPusher(partyId);
}