From 002f0834cc4d94884bb8cca1c6bb8ed65c181c81 2014-10-08 18:30:30
From: Jessica B. Hamrick <jhamrick@berkeley.edu>
Date: 2014-10-08 18:30:30
Subject: [PATCH] Don't actually change kernel constructor signature

---

diff --git a/IPython/html/static/services/kernels/js/kernel.js b/IPython/html/static/services/kernels/js/kernel.js
index 2d4c9a0..39ce935 100644
--- a/IPython/html/static/services/kernels/js/kernel.js
+++ b/IPython/html/static/services/kernels/js/kernel.js
@@ -20,13 +20,12 @@ define([
      * @param {string} kernel_service_url - the URL to access the kernel REST api
      * @param {string} ws_url - the websockets URL
      * @param {Notebook} notebook - notebook object
-     * @param {string} id - the kernel id
      * @param {string} name - the kernel type (e.g. python3)
      */
-    var Kernel = function (kernel_service_url, ws_url, notebook, id, name) {
+    var Kernel = function (kernel_service_url, ws_url, notebook, name) {
         this.events = notebook.events;
 
-        this.id = id;
+        this.id = null;
         this.name = name;
 
         this.channels = {
@@ -36,7 +35,7 @@ define([
         };
 
         this.kernel_service_url = kernel_service_url;
-        this.kernel_url = utils.url_join_encode(this.kernel_service_url, this.id);
+        this.kernel_url = null;
         this.ws_url = ws_url || IPython.utils.get_body_data("wsUrl");
         if (!this.ws_url) {
             // trailing 's' in https will become wss for secure web sockets
@@ -153,9 +152,7 @@ define([
 
         var that = this;
         var on_success = function (data, status, xhr) {
-            that.id = data.id;
-            that.kernel_url = utils.url_join_encode(that.kernel_service_url, that.id);
-            that._kernel_started();
+            that._kernel_started(data);
             if (success) {
                 success(data, status, xhr);
             }
@@ -256,7 +253,7 @@ define([
 
         var that = this;
         var on_success = function (data, status, xhr) {
-            that._kernel_started();
+            that._kernel_started(data);
             if (success) {
                 success(data, status, xhr);
             }
@@ -332,8 +329,12 @@ define([
      * then actually connecting to the kernel.
      *
      * @function _kernel_started
+     * @param {Object} data - information about the kernel including id
      */
-    Kernel.prototype._kernel_started = function () {
+    Kernel.prototype._kernel_started = function (data) {
+        this.id = data.id;
+        this.kernel_url = utils.url_join_encode(this.kernel_service_url, this.id);
+
         console.log("Kernel started: ", this.id);
         this.events.trigger('status_started.Kernel', {kernel: this});
         this.start_channels();
diff --git a/IPython/html/static/services/sessions/js/session.js b/IPython/html/static/services/sessions/js/session.js
index 48e10fd..f2ef5b8 100644
--- a/IPython/html/static/services/sessions/js/session.js
+++ b/IPython/html/static/services/sessions/js/session.js
@@ -85,10 +85,8 @@ define([
         var that = this;
         var on_success = function (data, status, xhr) {
             var kernel_service_url = utils.url_path_join(that.base_url, "api/kernels");
-            that.kernel = new kernel.Kernel(
-                kernel_service_url, that.ws_url, that.notebook,
-                that.kernel_model.id, that.kernel_model.name);
-            that.kernel._kernel_started();
+            that.kernel = new kernel.Kernel(kernel_service_url, that.ws_url, that.notebook, that.kernel_model.name);
+            that.kernel._kernel_started(data.kernel);
             if (success) {
                 success(data, status, xhr);
             }