From 7f08e42d3345f263fdd10cb2ae05799c015d2a5d Mon Sep 17 00:00:00 2001 From: Seth Call Date: Sun, 23 Feb 2014 05:21:36 +0000 Subject: [PATCH] * also put promptLeave = false if the session is already over --- web/app/assets/javascripts/fakeJamClient.js | 7 +++++++ web/app/assets/javascripts/session.js | 1 + 2 files changed, 8 insertions(+) diff --git a/web/app/assets/javascripts/fakeJamClient.js b/web/app/assets/javascripts/fakeJamClient.js index ea2d54535..3f3acabc0 100644 --- a/web/app/assets/javascripts/fakeJamClient.js +++ b/web/app/assets/javascripts/fakeJamClient.js @@ -10,6 +10,7 @@ // Change this to false if you want to see FTUE with fake jam client var ftueStatus = true; var eventCallbackName = ''; + var alertCallbackName = ''; var eventCallbackRate = 1000; var vuValue = -70; var vuChange = 10; @@ -304,7 +305,12 @@ } function SessionSetAlertCallback(callback) { + alertCallbackName = callback; + // simulate a backend alert + setTimeout(function() { + eval(alertCallbackName + '(27)'); + }, 3000) } function SessionSetConnectionStatusRefreshRate(milliseconds) { @@ -357,6 +363,7 @@ vuValue += vuChange; if (vuValue > 10 || vuValue < -70) { vuChange = vuChange * -1; } + } function SetVURefreshRate(rateMS) { eventCallbackRate = rateMS; diff --git a/web/app/assets/javascripts/session.js b/web/app/assets/javascripts/session.js index 12ee78561..887b4b98d 100644 --- a/web/app/assets/javascripts/session.js +++ b/web/app/assets/javascripts/session.js @@ -418,6 +418,7 @@ .fail(function(xhr, textStatus, errorMessage) { if(xhr.status == 404) { // we tried to join the session, but it's already gone. kick user back to join session screen + promptLeave = false; context.window.location = "/client#/findSession"; app.notify( { title: "Unable to Join Session",