From e143dc4e1fe93745336e5d17132c38474f617cf6 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Wed, 22 Jul 2015 09:55:28 -0500 Subject: [PATCH] * VRFS-3361 - make sure we leave the session in all cases that you leave the session screen --- .../javascripts/react-components/SessionScreen.js.jsx.coffee | 3 ++- .../javascripts/react-components/stores/SessionStore.js.coffee | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/web/app/assets/javascripts/react-components/SessionScreen.js.jsx.coffee b/web/app/assets/javascripts/react-components/SessionScreen.js.jsx.coffee index e7b0203cc..46288400d 100644 --- a/web/app/assets/javascripts/react-components/SessionScreen.js.jsx.coffee +++ b/web/app/assets/javascripts/react-components/SessionScreen.js.jsx.coffee @@ -58,7 +58,8 @@ SessionActions = @SessionActions leaveSessionWarningDialog = new context.JK.LeaveSessionWarningDialog(context.JK.app, () => @allowLeave = true - context.location.hash = data.hash + SessionActions.leaveSession(hash: data.hash) + #context.location.hash = data.hash ) leaveSessionWarningDialog.initialize() diff --git a/web/app/assets/javascripts/react-components/stores/SessionStore.js.coffee b/web/app/assets/javascripts/react-components/stores/SessionStore.js.coffee index 3f49d90c8..7ed83a6ce 100644 --- a/web/app/assets/javascripts/react-components/stores/SessionStore.js.coffee +++ b/web/app/assets/javascripts/react-components/stores/SessionStore.js.coffee @@ -958,6 +958,8 @@ NotificationActions = @NotificationActions window.history.go(behavior.location) else window.location = behavior.location + else if behavior.hash + window.location.hash = behavior.hash else logger.warn("no location specified in leaveSession action", behavior) window.location = '/client#/home'