mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-03-13 13:17:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1826 from minrk/cell-clears-callbacks

Browse Source 
don’t clear callbacks for cell output until next execute
This commit is contained in:
Kyle Kelley 2016-10-21 07:18:03 -07:00 committed by GitHub
commit 2456687a12
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
notebook/static/notebook/js/codecell.js
View File

@ -340,6 +340,7 @@ define([
CodeCell.prototype.get_callbacks = function () {
var that = this;
return {
clear_on_done: false,
shell : {
reply : $.proxy(this._handle_execute_reply, this),
payload : {
@ -357,7 +358,7 @@ define([
that.output_area.handle_clear_output.apply(that.output_area, arguments);
},
},
input : $.proxy(this._handle_input_request, this)
input : $.proxy(this._handle_input_request, this),
};
};

10
notebook/static/services/kernels/kernel.js
View File

@ -726,6 +726,7 @@ define([
* @param callbacks.iopub.output {function}
* @param callbacks.iopub.clear_output {function}
* @param callbacks.input {function}
* @param callbacks.clear_on_done=true {Bolean}
* @param {object} [options]
* @param [options.silent=false] {Boolean}
* @param [options.user_expressions=empty_dict] {Dict}
@ -864,7 +865,7 @@ define([
var callbacks = this._msg_callbacks[msg_id];
if (callbacks !== undefined) {
callbacks.shell_done = true;
if (callbacks.iopub_done) {
if (callbacks.clear_on_done && callbacks.iopub_done) {
this.clear_callbacks_for_msg(msg_id);
}
}
@ -877,7 +878,7 @@ define([
var callbacks = this._msg_callbacks[msg_id];
if (callbacks !== undefined) {
callbacks.iopub_done = true;
if (callbacks.shell_done) {
if (callbacks.clear_on_done && callbacks.shell_done) {
this.clear_callbacks_for_msg(msg_id);
}
}
@ -900,8 +901,13 @@ define([
cbcopy.shell = callbacks.shell;
cbcopy.iopub = callbacks.iopub;
cbcopy.input = callbacks.input;
cbcopy.clear_on_done = callbacks.clear_on_done;
cbcopy.shell_done = (!callbacks.shell);
cbcopy.iopub_done = (!callbacks.iopub);
if (callbacks.clear_on_done === undefined) {
// default to clear-on-done
cbcopy.clear_on_done = true;
}
} else {
this.last_msg_callbacks = {};
}