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

don't trigger kernel_starting after kernel_connected

Browse Source 
trigger instead at the beginning of Kernel.start

if a websocket is fully connected, the kernel has finished starting
This commit is contained in:
Min RK 2015-02-02 14:11:26 -08:00
parent 6d248f258a
commit ded9e7b6ad
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IPython/html/static/services/kernels/kernel.js
View File

@ -180,6 +180,7 @@ define([
url = url + "?" + qs;
}
this.events.trigger('kernel_starting.Kernel', {kernel: this});
var that = this;
var on_success = function (data, status, xhr) {
that.events.trigger('kernel_created.Kernel', {kernel: that});
@ -402,7 +403,6 @@ define([
* @function _kernel_connected
*/
this.events.trigger('kernel_connected.Kernel', {kernel: this});
this.events.trigger('kernel_starting.Kernel', {kernel: this});
// get kernel info so we know what state the kernel is in
var that = this;
this.kernel_info(function (reply) {

3
IPython/html/tests/services/kernel.js
View File

@ -163,9 +163,9 @@ casper.notebook_test(function () {
'kill/start',
[
'kernel_killed.Kernel',
'kernel_starting.Kernel',
'kernel_created.Kernel',
'kernel_connected.Kernel',
'kernel_starting.Kernel',
'kernel_ready.Kernel'
],
function () {
@ -205,7 +205,6 @@ casper.notebook_test(function () {
'kernel_restarting.Kernel',
'kernel_created.Kernel',
'kernel_connected.Kernel',
'kernel_starting.Kernel',
'kernel_ready.Kernel'
],
function () {

2
IPython/html/tests/services/session.js
View File

@ -100,7 +100,6 @@ casper.notebook_test(function () {
[
'kernel_created.Session',
'kernel_connected.Kernel',
'kernel_starting.Kernel',
'kernel_ready.Kernel'
],
function () {
@ -129,7 +128,6 @@ casper.notebook_test(function () {
'kernel_killed.Session',
'kernel_created.Session',
'kernel_connected.Kernel',
'kernel_starting.Kernel',
'kernel_ready.Kernel'
],
function () {