mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2024-12-21 04:10:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2525 from Carreau/execute_hooks

Browse Source 
Add event to kernel execution/shell reply.
This commit is contained in:
Bussonnier Matthias 2012-11-09 06:08:18 -08:00
commit 56f1f39fbe
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
IPython/frontend/html/notebook/static/js/kernel.js
View File

@ -64,7 +64,7 @@ var IPython = (function (IPython) {
Kernel.prototype.restart = function () {
$([IPython.events]).trigger({type: 'status_restarting.Kernel', kernel: this});
$([IPython.events]).trigger('status_restarting.Kernel', {kernel: this});
var that = this;
if (this.running) {
this.stop_channels();
@ -86,6 +86,7 @@ var IPython = (function (IPython) {
this.start_channels();
this.shell_channel.onmessage = $.proxy(this._handle_shell_reply,this);
this.iopub_channel.onmessage = $.proxy(this._handle_iopub_reply,this);
$([IPython.events]).trigger('status_started.Kernel', {kernel: this});
};
@ -245,7 +246,8 @@ var IPython = (function (IPython) {
user_expressions : {},
allow_stdin : false
};
$.extend(true, content, options)
$.extend(true, content, options)
$([IPython.events]).trigger('execution_request.Kernel', {kernel: this, content:content});
var msg = this._get_msg("execute_request", content);
this.shell_channel.send(JSON.stringify(msg));
this.set_callbacks_for_msg(msg.header.msg_id, callbacks);
@ -279,7 +281,7 @@ var IPython = (function (IPython) {
Kernel.prototype.interrupt = function () {
if (this.running) {
$([IPython.events]).trigger({type: 'status_interrupting.Kernel', kernel: this});
$([IPython.events]).trigger('status_interrupting.Kernel', {kernel: this});
$.post(this.kernel_url + "/interrupt");
};
};
@ -312,6 +314,7 @@ var IPython = (function (IPython) {
Kernel.prototype._handle_shell_reply = function (e) {
reply = $.parseJSON(e.data);
$([IPython.events]).trigger('shell_reply.Kernel', {kernel: this, reply:reply});
var header = reply.header;
var content = reply.content;
var metadata = reply.metadata;
@ -367,12 +370,12 @@ var IPython = (function (IPython) {
}
} else if (msg_type === 'status') {
if (content.execution_state === 'busy') {
$([IPython.events]).trigger({type: 'status_busy.Kernel', kernel: this});
$([IPython.events]).trigger('status_busy.Kernel', {kernel: this});
} else if (content.execution_state === 'idle') {
$([IPython.events]).trigger({type: 'status_idle.Kernel', kernel: this});
$([IPython.events]).trigger('status_idle.Kernel', {kernel: this});
} else if (content.execution_state === 'dead') {
this.stop_channels();
$([IPython.events]).trigger({type: 'status_dead.Kernel', kernel: this});
$([IPython.events]).trigger('status_dead.Kernel', {kernel: this});
};
} else if (msg_type === 'clear_output') {
var cb = callbacks['clear_output'];