mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-24 12:05:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

don't prevent spec_changed from firing on load

Browse Source 
fixes check for the case where kernelspec info is coming from the kernel,
rather than notebook metadata.

This case was getting skipped by a bad check on `_session_starting`.
This commit is contained in:
Min RK 2015-01-31 14:27:15 -08:00
parent e48d772063
commit 0ef85028d7
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IPython/html/static/notebook/js/kernelselector.js
View File

@ -218,7 +218,8 @@ define([
return; return;
} }
} }
if (this.notebook._session_starting) { if (this.notebook._session_starting &&
this.notebook.session.kernel.name !== ks.name) {
console.error("Cannot change kernel while waiting for pending session start."); console.error("Cannot change kernel while waiting for pending session start.");
return; return;
} }

2
IPython/html/static/notebook/js/notebook.js
View File

@ -232,7 +232,7 @@ define(function (require) {
language: data.spec.language, language: data.spec.language,
}; };
// start session if the current session isn't already correct // start session if the current session isn't already correct
if (!(this.session && this.session.kernel && this.session.kernel.name === data.name)) { if (!(that.session && that.session.kernel && that.session.kernel.name === data.name)) {
that.start_session(data.name); that.start_session(data.name);
} }
}); });