##// END OF EJS Templates
Merge pull request #2183 from jasongrout/trigger-kernel...
Min RK -
r8008:f5593ac8 merge
parent child Browse files
Show More
@@ -64,7 +64,7 b' var IPython = (function (IPython) {'
64
64
65
65
66 Kernel.prototype.restart = function () {
66 Kernel.prototype.restart = function () {
67 $([IPython.events]).trigger('status_restarting.Kernel');
67 $([IPython.events]).trigger({type: 'status_restarting.Kernel', kernel: this});
68 var that = this;
68 var that = this;
69 if (this.running) {
69 if (this.running) {
70 this.stop_channels();
70 this.stop_channels();
@@ -279,7 +279,7 b' var IPython = (function (IPython) {'
279
279
280 Kernel.prototype.interrupt = function () {
280 Kernel.prototype.interrupt = function () {
281 if (this.running) {
281 if (this.running) {
282 $([IPython.events]).trigger('status_interrupting.Kernel');
282 $([IPython.events]).trigger({type: 'status_interrupting.Kernel', kernel: this});
283 $.post(this.kernel_url + "/interrupt");
283 $.post(this.kernel_url + "/interrupt");
284 };
284 };
285 };
285 };
@@ -367,12 +367,12 b' var IPython = (function (IPython) {'
367 }
367 }
368 } else if (msg_type === 'status') {
368 } else if (msg_type === 'status') {
369 if (content.execution_state === 'busy') {
369 if (content.execution_state === 'busy') {
370 $([IPython.events]).trigger('status_busy.Kernel');
370 $([IPython.events]).trigger({type: 'status_busy.Kernel', kernel: this});
371 } else if (content.execution_state === 'idle') {
371 } else if (content.execution_state === 'idle') {
372 $([IPython.events]).trigger('status_idle.Kernel');
372 $([IPython.events]).trigger({type: 'status_idle.Kernel', kernel: this});
373 } else if (content.execution_state === 'dead') {
373 } else if (content.execution_state === 'dead') {
374 this.stop_channels();
374 this.stop_channels();
375 $([IPython.events]).trigger('status_dead.Kernel');
375 $([IPython.events]).trigger({type: 'status_dead.Kernel', kernel: this});
376 };
376 };
377 } else if (msg_type === 'clear_output') {
377 } else if (msg_type === 'clear_output') {
378 var cb = callbacks['clear_output'];
378 var cb = callbacks['clear_output'];
General Comments 0
You need to be logged in to leave comments. Login now