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

re-enable limit of 1 tab per user connected to pusher

Browse Source
This commit is contained in:
Matteo Pagliazzi
2016-09-08 18:51:24 +02:00
parent ef73c61e0e
commit d4dc455926
1 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,16 +13,14 @@ angular.module('habitrpg')
pusher: undefined,
socketId: undefined, // when defined the user is connected
};
// Limit of 1 connected tab is disabled for now
// var tabIdKey = 'habitica-active-tab';
// var tabId = Shared.uuid();
var tabIdKey = 'habitica-active-tab';
var tabId = Shared.uuid();
function connectToPusher (partyId) {
// Limit of 1 connected tab is disabled for now
// localStorage.setItem(tabIdKey, tabId);
// window.onbeforeunload = function () {
// localStorage.removeItem(tabIdKey);
// }
localStorage.setItem(tabIdKey, tabId);
window.onbeforeunload = function () {
localStorage.removeItem(tabIdKey);
}
api.pusher = new Pusher(window.env['PUSHER:KEY'], {
encrypted: true,
@@ -113,10 +111,9 @@ angular.module('habitrpg')
var awaitActivity = function() {
$(document).off('mousemove keydown mousedown touchstart', awaitActivity);
connectToPusher(partyId);
// Limit of 1 connected tab is disabled for now
// if (!localStorage.getItem(tabIdKey) || localStorage.getItem(tabIdKey) === tabId) {
// connectToPusher(partyId);
// }
if (!localStorage.getItem(tabIdKey) || localStorage.getItem(tabIdKey) === tabId) {
connectToPusher(partyId);
}
};
$(document).on('mousemove keydown mousedown touchstart', awaitActivity);
@@ -137,23 +134,22 @@ angular.module('habitrpg')
connectToPusher(partyId);
// DISABLED FOR NOW
// See if another tab is already connected to Pusher
// if (!localStorage.getItem(tabIdKey)) {
// connectToPusher(partyId);
// }
if (!localStorage.getItem(tabIdKey)) {
connectToPusher(partyId);
}
// when a tab is closed, connect the next one
// wait between 100 and 500ms to avoid two tabs connecting at the same time
// window.addEventListener('storage', function(e) {
// if (e.key === tabIdKey && e.newValue === null) {
// setTimeout(function () {
// if (!localStorage.getItem(tabIdKey)) {
// connectToPusher(partyId);
// }
// }, Math.floor(Math.random() * 501) + 100);
// }
// });
window.addEventListener('storage', function(e) {
if (e.key === tabIdKey && e.newValue === null) {
setTimeout(function () {
if (!localStorage.getItem(tabIdKey)) {
connectToPusher(partyId);
}
}, Math.floor(Math.random() * 501) + 100);
}
});
});
return api;