Fix bugs with this and that

IPython/html/static/services/kernels/js/kernel.js

@@ -94,8 +94,8 b' define(['
             that.send_input_reply(data);
         });
 
-        var record_status = function (evt) {
-            console.log('Kernel: ' + evt.type + ' (' + that.id + ')');
+        var record_status = function (evt, info) {
+            console.log('Kernel: ' + evt.type + ' (' + info.kernel.id + ')');
         };
 
         this.events.on('kernel_created.Kernel', record_status);
@@ -397,7 +397,7 b' define(['
         // get kernel info so we know what state the kernel is in
         var that = this;
         this.kernel_info(function () {
-            that.events.trigger('kernel_ready.Kernel', {kernel: this});
+            that.events.trigger('kernel_ready.Kernel', {kernel: that});
         });
     };
 
@@ -451,7 +451,7 b' define(['
                 that.get_info(function () {
                     that._ws_closed(ws_host_url, false);
                 }, function () {
-                    that.events.trigger('kernel_dead.Kernel', {kernel: this});
+                    that.events.trigger('kernel_dead.Kernel', {kernel: that});
                     that._kernel_dead();
                 });
             }
@@ -539,7 +539,7 b' define(['
         var that = this;
         var close = function (c) {
             return function () {
-                if (that.channels[c].readyState === WebSocket.CLOSED) {
+                if (that.channels[c] && that.channels[c].readyState === WebSocket.CLOSED) {
                     that.channels[c] = null;
                 }
             };

IPython/html/static/services/sessions/js/session.js

@@ -50,8 +50,8 b' define(['
 
     Session.prototype.bind_events = function () {
         var that = this;
-        var record_status = function (evt) {
-            console.log('Session: ' + evt.type + ' (' + that.id + ')');
+        var record_status = function (evt, info) {
+            console.log('Session: ' + evt.type + ' (' + info.session.id + ')');
         };
 
         this.events.on('kernel_created.Session', record_status);