From 37c2419c5eb14ebf031b03be29679d811091da75 Mon Sep 17 00:00:00 2001 From: "Jessica B. Hamrick" Date: Mon, 6 Oct 2014 11:53:44 -0700 Subject: [PATCH] Rename all status_event to kernel_event --- IPython/html/static/notebook/js/completer.js | 4 +- .../static/notebook/js/notificationarea.js | 24 ++++---- IPython/html/static/notebook/js/tour.js | 6 +- .../html/static/services/kernels/js/kernel.js | 58 +++++++++---------- .../static/services/sessions/js/session.js | 4 +- IPython/html/tests/services/kernel.js | 48 +++++++-------- IPython/html/tests/services/session.js | 24 ++++---- IPython/html/tests/util.js | 4 +- 8 files changed, 86 insertions(+), 86 deletions(-) diff --git a/IPython/html/static/notebook/js/completer.js b/IPython/html/static/notebook/js/completer.js index ec7287867..951fb787d 100644 --- a/IPython/html/static/notebook/js/completer.js +++ b/IPython/html/static/notebook/js/completer.js @@ -82,10 +82,10 @@ define([ this.cell = cell; this.editor = cell.code_mirror; var that = this; - events.on('status_busy.Kernel', function () { + events.on('kernel_busy.Kernel', function () { that.skip_kernel_completion = true; }); - events.on('status_idle.Kernel', function () { + events.on('kernel_idle.Kernel', function () { that.skip_kernel_completion = false; }); }; diff --git a/IPython/html/static/notebook/js/notificationarea.js b/IPython/html/static/notebook/js/notificationarea.js index 57f7edfc7..1b50a27be 100644 --- a/IPython/html/static/notebook/js/notificationarea.js +++ b/IPython/html/static/notebook/js/notificationarea.js @@ -128,20 +128,20 @@ define([ knw.info("Kernel Created", 500); }); - this.events.on('status_reconnecting.Kernel', function () { + this.events.on('kernel_reconnecting.Kernel', function () { knw.warning("Connecting to kernel"); }); - this.events.on('status_connected.Kernel', function () { + this.events.on('kernel_connected.Kernel', function () { knw.info("Connected", 500); }); - this.events.on('status_restarting.Kernel', function () { + this.events.on('kernel_restarting.Kernel', function () { that.save_widget.update_document_title(); knw.set_message("Restarting kernel", 2000); }); - this.events.on('status_autorestarting.Kernel', function (evt, info) { + this.events.on('kernel_autorestarting.Kernel', function (evt, info) { // Only show the dialog on the first restart attempt. This // number gets tracked by the `Kernel` object and passed // along here, because we don't want to show the user 5 @@ -167,17 +167,17 @@ define([ $kernel_ind_icon.attr('class','kernel_dead_icon').attr('title','Kernel Dead'); }); - this.events.on('status_interrupting.Kernel', function () { + this.events.on('kernel_interrupting.Kernel', function () { knw.set_message("Interrupting kernel", 2000); }); - this.events.on('status_disconnected.Kernel', function () { + this.events.on('kernel_disconnected.Kernel', function () { $kernel_ind_icon .attr('class', 'kernel_disconnected_icon') .attr('title', 'No Connection to Kernel'); }); - this.events.on('connection_failed.Kernel', function (evt, info) { + this.events.on('kernel_connection_failed.Kernel', function (evt, info) { // only show the dialog if this is the first failed // connect attempt, because the kernel will continue // trying to reconnect and we don't want to spam the user @@ -201,7 +201,7 @@ define([ } }); - this.events.on('status_killed.Kernel status_killed.Session', function () { + this.events.on('kernel_killed.Kernel kernel_killed.Session', function () { that.save_widget.update_document_title(); knw.danger("Dead kernel"); $kernel_ind_icon.attr('class','kernel_dead_icon').attr('title','Kernel Dead'); @@ -285,24 +285,24 @@ define([ knw.danger(short, undefined, showMsg); }); - this.events.on('status_starting.Kernel', function () { + this.events.on('kernel_starting.Kernel', function () { window.document.title='(Starting) '+window.document.title; $kernel_ind_icon.attr('class','kernel_busy_icon').attr('title','Kernel Busy'); knw.set_message("Kernel starting, please wait..."); }); - this.events.on('status_ready.Kernel', function () { + this.events.on('kernel_ready.Kernel', function () { that.save_widget.update_document_title(); $kernel_ind_icon.attr('class','kernel_idle_icon').attr('title','Kernel Idle'); knw.info("Kernel ready", 500); }); - this.events.on('status_idle.Kernel', function () { + this.events.on('kernel_idle.Kernel', function () { that.save_widget.update_document_title(); $kernel_ind_icon.attr('class','kernel_idle_icon').attr('title','Kernel Idle'); }); - this.events.on('status_busy.Kernel', function () { + this.events.on('kernel_busy.Kernel', function () { window.document.title='(Busy) '+window.document.title; $kernel_ind_icon.attr('class','kernel_busy_icon').attr('title','Kernel Busy'); }); diff --git a/IPython/html/static/notebook/js/tour.js b/IPython/html/static/notebook/js/tour.js index e95b92c1d..718938b6f 100644 --- a/IPython/html/static/notebook/js/tour.js +++ b/IPython/html/static/notebook/js/tour.js @@ -91,19 +91,19 @@ define([ element: "#kernel_indicator", title: "Kernel Indicator", placement: 'bottom', - onShow: function(tour) { events.trigger('status_idle.Kernel');}, + onShow: function(tour) { events.trigger('kernel_idle.Kernel');}, content: "This is the Kernel indicator. It looks like this when the Kernel is idle." }, { element: "#kernel_indicator", title: "Kernel Indicator", placement: 'bottom', - onShow: function(tour) { events.trigger('status_busy.Kernel'); }, + onShow: function(tour) { events.trigger('kernel_busy.Kernel'); }, content: "The Kernel indicator looks like this when the Kernel is busy." }, { element: ".fa-stop", placement: 'bottom', title: "Interrupting the Kernel", - onHide: function(tour) { events.trigger('status_idle.Kernel'); }, + onHide: function(tour) { events.trigger('kernel_idle.Kernel'); }, content: "To cancel a computation in progress, you can click here." }, { element: "#notification_kernel", diff --git a/IPython/html/static/services/kernels/js/kernel.js b/IPython/html/static/services/kernels/js/kernel.js index 4e5035fe6..515eee740 100644 --- a/IPython/html/static/services/kernels/js/kernel.js +++ b/IPython/html/static/services/kernels/js/kernel.js @@ -99,25 +99,25 @@ define([ }; this.events.on('kernel_created.Kernel', record_status); - this.events.on('status_reconnecting.Kernel', record_status); - this.events.on('status_connected.Kernel', record_status); - this.events.on('status_starting.Kernel', record_status); - this.events.on('status_restarting.Kernel', record_status); - this.events.on('status_autorestarting.Kernel', record_status); - this.events.on('status_interrupting.Kernel', record_status); - this.events.on('status_disconnected.Kernel', record_status); + this.events.on('kernel_reconnecting.Kernel', record_status); + this.events.on('kernel_connected.Kernel', record_status); + this.events.on('kernel_starting.Kernel', record_status); + this.events.on('kernel_restarting.Kernel', record_status); + this.events.on('kernel_autorestarting.Kernel', record_status); + this.events.on('kernel_interrupting.Kernel', record_status); + this.events.on('kernel_disconnected.Kernel', record_status); // these are commented out because they are triggered a lot, but can // be uncommented for debugging purposes - //this.events.on('status_idle.Kernel', record_status); - //this.events.on('status_busy.Kernel', record_status); - this.events.on('status_ready.Kernel', record_status); - this.events.on('status_killed.Kernel', record_status); + //this.events.on('kernel_idle.Kernel', record_status); + //this.events.on('kernel_busy.Kernel', record_status); + this.events.on('kernel_ready.Kernel', record_status); + this.events.on('kernel_killed.Kernel', record_status); this.events.on('kernel_dead.Kernel', record_status); - this.events.on('status_ready.Kernel', function () { + this.events.on('kernel_ready.Kernel', function () { that._autorestart_attempt = 0; }); - this.events.on('status_connected.Kernel', function () { + this.events.on('kernel_connected.Kernel', function () { that._reconnect_attempt = 0; }); }; @@ -236,7 +236,7 @@ define([ * @param {function} [error] - functon executed on ajax error */ Kernel.prototype.kill = function (success, error) { - this.events.trigger('status_killed.Kernel', {kernel: this}); + this.events.trigger('kernel_killed.Kernel', {kernel: this}); this._kernel_dead(); $.ajax(this.kernel_url, { processData: false, @@ -258,7 +258,7 @@ define([ * @param {function} [error] - functon executed on ajax error */ Kernel.prototype.interrupt = function (success, error) { - this.events.trigger('status_interrupting.Kernel', {kernel: this}); + this.events.trigger('kernel_interrupting.Kernel', {kernel: this}); var that = this; var on_success = function (data, status, xhr) { @@ -290,7 +290,7 @@ define([ * @param {function} [error] - functon executed on ajax error */ Kernel.prototype.restart = function (success, error) { - this.events.trigger('status_restarting.Kernel', {kernel: this}); + this.events.trigger('kernel_restarting.Kernel', {kernel: this}); this.stop_channels(); var that = this; @@ -329,7 +329,7 @@ define([ * @function reconnect */ Kernel.prototype.reconnect = function () { - this.events.trigger('status_reconnecting.Kernel', {kernel: this}); + this.events.trigger('kernel_reconnecting.Kernel', {kernel: this}); setTimeout($.proxy(this.start_channels, this), 3000); }; @@ -392,12 +392,12 @@ define([ * @function _kernel_connected */ Kernel.prototype._kernel_connected = function () { - this.events.trigger('status_connected.Kernel', {kernel: this}); - this.events.trigger('status_starting.Kernel', {kernel: this}); + 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 () { - that.events.trigger('status_ready.Kernel', {kernel: this}); + that.events.trigger('kernel_ready.Kernel', {kernel: this}); }); }; @@ -520,11 +520,11 @@ define([ Kernel.prototype._ws_closed = function(ws_url, error) { this.stop_channels(); - this.events.trigger('status_disconnected.Kernel', {kernel: this}); + this.events.trigger('kernel_disconnected.Kernel', {kernel: this}); if (error) { console.log('WebSocket connection failed: ', ws_url); this._reconnect_attempt = this._reconnect_attempt + 1; - this.events.trigger('connection_failed.Kernel', {kernel: this, ws_url: ws_url, attempt: this._reconnect_attempt}); + this.events.trigger('kernel_connection_failed.Kernel', {kernel: this, ws_url: ws_url, attempt: this._reconnect_attempt}); } this.reconnect(); }; @@ -909,7 +909,7 @@ define([ } if (execution_state === 'busy') { - this.events.trigger('status_busy.Kernel', {kernel: this}); + this.events.trigger('kernel_busy.Kernel', {kernel: this}); } else if (execution_state === 'idle') { // signal that iopub callbacks are (probably) done @@ -918,23 +918,23 @@ define([ this._finish_iopub(parent_id); // trigger status_idle event - this.events.trigger('status_idle.Kernel', {kernel: this}); + this.events.trigger('kernel_idle.Kernel', {kernel: this}); } else if (execution_state === 'starting') { - this.events.trigger('status_starting.Kernel', {kernel: this}); + this.events.trigger('kernel_starting.Kernel', {kernel: this}); var that = this; this.kernel_info(function () { - that.events.trigger('status_ready.Kernel', {kernel: this}); + that.events.trigger('kernel_ready.Kernel', {kernel: this}); }); } else if (execution_state === 'restarting') { // autorestarting is distinct from restarting, // in that it means the kernel died and the server is restarting it. - // status_restarting sets the notification widget, + // kernel_restarting sets the notification widget, // autorestart shows the more prominent dialog. this._autorestart_attempt = this._autorestart_attempt + 1; - this.events.trigger('status_restarting.Kernel', {kernel: this}); - this.events.trigger('status_autorestarting.Kernel', {kernel: this, attempt: this._autorestart_attempt}); + this.events.trigger('kernel_restarting.Kernel', {kernel: this}); + this.events.trigger('kernel_autorestarting.Kernel', {kernel: this, attempt: this._autorestart_attempt}); } else if (execution_state === 'dead') { this.events.trigger('kernel_dead.Kernel', {kernel: this}); diff --git a/IPython/html/static/services/sessions/js/session.js b/IPython/html/static/services/sessions/js/session.js index 0de632efd..726a1523f 100644 --- a/IPython/html/static/services/sessions/js/session.js +++ b/IPython/html/static/services/sessions/js/session.js @@ -56,7 +56,7 @@ define([ this.events.on('kernel_created.Session', record_status); this.events.on('kernel_dead.Session', record_status); - this.events.on('status_killed.Session', record_status); + this.events.on('kernel_killed.Session', record_status); // if the kernel dies, then also remove the session this.events.on('kernel_dead.Kernel', function () { @@ -189,7 +189,7 @@ define([ */ Session.prototype.delete = function (success, error) { if (this.kernel) { - this.events.trigger('status_killed.Session', {session: this, kernel: this.kernel}); + this.events.trigger('kernel_killed.Session', {session: this, kernel: this.kernel}); this.kernel._kernel_dead(); } diff --git a/IPython/html/tests/services/kernel.js b/IPython/html/tests/services/kernel.js index bba1c283b..7739d0e40 100644 --- a/IPython/html/tests/services/kernel.js +++ b/IPython/html/tests/services/kernel.js @@ -162,11 +162,11 @@ casper.notebook_test(function () { this.event_test( 'kill/start', [ - 'status_killed.Kernel', + 'kernel_killed.Kernel', 'kernel_created.Kernel', - 'status_connected.Kernel', - 'status_starting.Kernel', - 'status_ready.Kernel' + 'kernel_connected.Kernel', + 'kernel_starting.Kernel', + 'kernel_ready.Kernel' ], function () { this.thenEvaluate(function () { @@ -185,8 +185,8 @@ casper.notebook_test(function () { this.event_test( 'reconnect', [ - 'status_reconnecting.Kernel', - 'status_connected.Kernel', + 'kernel_reconnecting.Kernel', + 'kernel_connected.Kernel', ], function () { this.thenEvaluate(function () { @@ -202,11 +202,11 @@ casper.notebook_test(function () { this.event_test( 'restart', [ - 'status_restarting.Kernel', + 'kernel_restarting.Kernel', 'kernel_created.Kernel', - 'status_connected.Kernel', - 'status_starting.Kernel', - 'status_ready.Kernel' + 'kernel_connected.Kernel', + 'kernel_starting.Kernel', + 'kernel_ready.Kernel' ], function () { this.thenEvaluate(function () { @@ -221,9 +221,9 @@ casper.notebook_test(function () { this.event_test( 'interrupt', [ - 'status_interrupting.Kernel', - 'status_busy.Kernel', - 'status_idle.Kernel' + 'kernel_interrupting.Kernel', + 'kernel_busy.Kernel', + 'kernel_idle.Kernel' ], function () { this.thenEvaluate(function () { @@ -237,11 +237,11 @@ casper.notebook_test(function () { this.event_test( 'ws_closed_ok', [ - 'status_disconnected.Kernel', - 'status_reconnecting.Kernel', - 'status_connected.Kernel', - 'status_busy.Kernel', - 'status_idle.Kernel' + 'kernel_disconnected.Kernel', + 'kernel_reconnecting.Kernel', + 'kernel_connected.Kernel', + 'kernel_busy.Kernel', + 'kernel_idle.Kernel' ], function () { this.thenEvaluate(function () { @@ -256,8 +256,8 @@ casper.notebook_test(function () { this.event_test( 'ws_closed_error', [ - 'status_disconnected.Kernel', - 'connection_failed.Kernel' + 'kernel_disconnected.Kernel', + 'kernel_connection_failed.Kernel' ], function () { this.thenEvaluate(function () { @@ -277,8 +277,8 @@ casper.notebook_test(function () { this.event_test( 'autorestarting', [ - 'status_restarting.Kernel', - 'status_autorestarting.Kernel', + 'kernel_restarting.Kernel', + 'kernel_autorestarting.Kernel', ], function () { this.thenEvaluate(function () { @@ -294,8 +294,8 @@ casper.notebook_test(function () { this.event_test( 'failed_restart', [ - 'status_restarting.Kernel', - 'status_autorestarting.Kernel', + 'kernel_restarting.Kernel', + 'kernel_autorestarting.Kernel', 'kernel_dead.Kernel' ], function () { diff --git a/IPython/html/tests/services/session.js b/IPython/html/tests/services/session.js index f365453e2..ed7c90b55 100644 --- a/IPython/html/tests/services/session.js +++ b/IPython/html/tests/services/session.js @@ -99,9 +99,9 @@ casper.notebook_test(function () { 'start_session', [ 'kernel_created.Session', - 'status_connected.Kernel', - 'status_starting.Kernel', - 'status_ready.Kernel' + 'kernel_connected.Kernel', + 'kernel_starting.Kernel', + 'kernel_ready.Kernel' ], function () { this.thenEvaluate(function () { @@ -114,7 +114,7 @@ casper.notebook_test(function () { // check for events when killing the session this.event_test( 'delete_session', - ['status_killed.Session'], + ['kernel_killed.Session'], function () { this.thenEvaluate(function () { IPython.notebook.session.delete(); @@ -126,11 +126,11 @@ casper.notebook_test(function () { this.event_test( 'restart_session', [ - 'status_killed.Session', + 'kernel_killed.Session', 'kernel_created.Session', - 'status_connected.Kernel', - 'status_starting.Kernel', - 'status_ready.Kernel' + 'kernel_connected.Kernel', + 'kernel_starting.Kernel', + 'kernel_ready.Kernel' ], function () { this.thenEvaluate(function () { @@ -144,9 +144,9 @@ casper.notebook_test(function () { this.event_test( 'failed_restart', [ - 'status_restarting.Kernel', - 'status_autorestarting.Kernel', - 'status_killed.Session', + 'kernel_restarting.Kernel', + 'kernel_autorestarting.Kernel', + 'kernel_killed.Session', 'kernel_dead.Kernel', ], function () { @@ -170,7 +170,7 @@ casper.notebook_test(function () { this.event_test( 'bad_start_session', [ - 'status_killed.Session', + 'kernel_killed.Session', 'kernel_dead.Session' ], function () { diff --git a/IPython/html/tests/util.js b/IPython/html/tests/util.js index 0a995374f..7d9be638c 100644 --- a/IPython/html/tests/util.js +++ b/IPython/html/tests/util.js @@ -28,10 +28,10 @@ casper.open_new_notebook = function () { this.thenEvaluate(function () { require(['base/js/namespace', 'base/js/events'], function (IPython, events) { - events.on('status_idle.Kernel',function () { + events.on('kernel_idle.Kernel',function () { IPython._status = 'idle'; }); - events.on('status_busy.Kernel',function () { + events.on('kernel_busy.Kernel',function () { IPython._status = 'busy'; }); });