From e3c4b09c3f0bdc940bc8d64e67a1235022c8e96b Mon Sep 17 00:00:00 2001 From: Seth Call Date: Tue, 25 Feb 2014 02:20:17 +0000 Subject: [PATCH] * promptLeave --- web/app/assets/javascripts/jamkazam.js | 1 + web/app/assets/javascripts/session.js | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/web/app/assets/javascripts/jamkazam.js b/web/app/assets/javascripts/jamkazam.js index 570968f84..0a1771068 100644 --- a/web/app/assets/javascripts/jamkazam.js +++ b/web/app/assets/javascripts/jamkazam.js @@ -232,6 +232,7 @@ } } else { + logger.error("Unexpected ajax error: " + textStatus + ", msg:" + errorMessage); app.notify({title: textStatus, text: errorMessage, detail: jqXHR.responseText}); } } diff --git a/web/app/assets/javascripts/session.js b/web/app/assets/javascripts/session.js index 887b4b98d..768004dae 100644 --- a/web/app/assets/javascripts/session.js +++ b/web/app/assets/javascripts/session.js @@ -432,6 +432,7 @@ }); } + // not leave session but leave screen function beforeLeave(data) { if(promptLeave) { var leaveSessionWarningDialog = new context.JK.LeaveSessionWarningDialog(context.JK.app, @@ -1209,6 +1210,15 @@ } } + function sessionLeave(evt) { + evt.preventDefault(); + + promptLeave = false; + context.window.location = '/client#/home'; + + return false; + } + function sessionResync(evt) { evt.preventDefault(); var response = context.jamClient.SessionAudioResync(); @@ -1388,7 +1398,8 @@ } function events() { - $('#session-resync').on('click', sessionResync); + $('#session-leave').on('click', sessionLeave); + $('#session-resync').on('click', sessionResync); $('#session-contents').on("click", '[action="delete"]', deleteSession); $('#tracks').on('click', 'div[control="mute"]', toggleMute); $('#recording-start-stop').on('click', startStopRecording);