From 2fa2c22e6db74557e58b788f41ca00b5b0a29e73 Mon Sep 17 00:00:00 2001
From: Jonathon Wilson <jonathon@jamkazam.com>
Date: Mon, 29 Oct 2012 09:10:02 -0600
Subject: [PATCH] Minor tweaks to Tiho's saving of sessionId on screen events

---
 app/assets/javascripts/session.js | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/session.js b/app/assets/javascripts/session.js
index 43cf317b7..a05bbf5ce 100644
--- a/app/assets/javascripts/session.js
+++ b/app/assets/javascripts/session.js
@@ -3,26 +3,28 @@
     context.JK = context.JK || {};
     context.JK.SessionScreen = function(app) {
         var logger = context.JK.logger;
+        var sessionId;
         var tracks = {};
 
-        // TODO: This is a hack for now so we can have the session id in beforeHide
-        var hack_session_id;
+        function beforeShow(data) {
+            logger.debug('beforeShow');
+            logger.debug(data);
+            sessionId = data.id;
+        }
 
         function afterShow(data) {
-            var sessionId = data.id;
-            hack_session_id = sessionId;
+            logger.debug('afterShow');
+            logger.debug(data);
             $.ajax({
                 type: "GET",
                 url: "/api/sessions/" + sessionId
             }).done(renderSession);
-
             context.JK.joinMusicSession(sessionId);
         }
 
         function beforeHide(data) {
-            // TODO: data is empty here - how to get the session id?
-            //var sessionId = data.id;
-            var sessionId = hack_session_id;
+            logger.debug('beforeHide');
+            logger.debug(data);
             context.JK.leaveMusicSession(sessionId);
         }
 
@@ -88,8 +90,9 @@
         this.initialize = function() {
             events();
             screenBindings = {
+                'beforeShow': beforeShow,
                 'afterShow': afterShow,
-                'beforeHide': beforeHide,
+                'beforeHide': beforeHide
             };
             app.bindScreen('session', screenBindings);
             app.subscribe(JK.MessageType.USER_JOINED_MUSIC_SESSION, _userJoinedSession);