From 13095eee664f7f05f2876c5831ea91ecefdca87b Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Mon, 2 Feb 2015 14:11:26 -0800
Subject: [PATCH] don't trigger kernel_starting after kernel_connected

trigger instead at the beginning of Kernel.start

if a websocket is fully connected, the kernel has finished starting
---
 IPython/html/static/services/kernels/kernel.js | 2 +-
 IPython/html/tests/services/kernel.js          | 3 +--
 IPython/html/tests/services/session.js         | 2 --
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/IPython/html/static/services/kernels/kernel.js b/IPython/html/static/services/kernels/kernel.js
index bb566acac76..f414507e75f 100644
--- a/IPython/html/static/services/kernels/kernel.js
+++ b/IPython/html/static/services/kernels/kernel.js
@@ -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) {
diff --git a/IPython/html/tests/services/kernel.js b/IPython/html/tests/services/kernel.js
index a944bd42ad9..3ce1abf6022 100644
--- a/IPython/html/tests/services/kernel.js
+++ b/IPython/html/tests/services/kernel.js
@@ -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 () {
diff --git a/IPython/html/tests/services/session.js b/IPython/html/tests/services/session.js
index ed7c90b5504..375c3bcb135 100644
--- a/IPython/html/tests/services/session.js
+++ b/IPython/html/tests/services/session.js
@@ -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 () {