diff --git a/IPython/html/static/notebook/js/kernelselector.js b/IPython/html/static/notebook/js/kernelselector.js index 8dcf7142a..c9f3f86d2 100644 --- a/IPython/html/static/notebook/js/kernelselector.js +++ b/IPython/html/static/notebook/js/kernelselector.js @@ -12,12 +12,14 @@ define([ this.selector = selector; this.notebook = notebook; this.kernelspecs = {}; - this.current = "python"; if (this.selector !== undefined) { this.element = $(selector); this.style(); this.request_kernelspecs(); } + + // For now, this is how we make this object available elsewhere + IPython.kernelselector = this; }; KernelSelector.prototype.style = function() { @@ -43,16 +45,19 @@ define([ }; KernelSelector.prototype.change_kernel = function(kernel_name) { - console.log("change_kernel " + kernel_name + " from " + this.current); - if (kernel_name === this.current) { + if (kernel_name === this.notebook.kernel.name) { return; } this.notebook.session.delete(); this.notebook.start_session(kernel_name); - this.current = kernel_name; - var display_name = this.kernelspecs[kernel_name].display_name; - this.element.find("#current_kernel_spec").text(display_name); }; + KernelSelector.prototype.set_displayed_name = function(kernel_name) { + var ks = this.kernelspecs[kernel_name] + if (ks !== undefined) { + this.element.find("#current_kernel_spec").text(ks.display_name); + } + }; + return {'KernelSelector': KernelSelector}; }); diff --git a/IPython/html/static/services/sessions/js/session.js b/IPython/html/static/services/sessions/js/session.js index 34c699627..1271eaae7 100644 --- a/IPython/html/static/services/sessions/js/session.js +++ b/IPython/html/static/services/sessions/js/session.js @@ -91,9 +91,12 @@ define([ */ Session.prototype._handle_start_success = function (data, status, xhr) { this.id = data.id; + // If we asked for 'python', the response will have 'python3' or 'python2' + this.kernel_name = data.kernel.name; var kernel_service_url = utils.url_path_join(this.base_url, "api/kernels"); this.kernel = new kernel.Kernel(kernel_service_url, this.ws_url, this.notebook, this.kernel_name); this.kernel._kernel_started(data.kernel); + IPython.kernelselector.set_displayed_name(this.kernel_name); }; /**