mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-02-05 12:19:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

support repeat displays with id

Browse Source
This commit is contained in:
Min RK 2016-11-07 23:28:43 -08:00
parent f82f2568f5
commit 5b2279c192
1 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -300,6 +300,8 @@ define([
*/ */
this.events.trigger('kernel_restarting.Kernel', {kernel: this}); this.events.trigger('kernel_restarting.Kernel', {kernel: this});
this.stop_channels(); this.stop_channels();
this._msg_callbacks = {};
this._display_id_targets = {};
var that = this; var that = this;
var on_success = function (data, status, xhr) { var on_success = function (data, status, xhr) {
@ -451,7 +453,7 @@ define([
var ws_host_url = this.ws_url + this.kernel_url; var ws_host_url = this.ws_url + this.kernel_url;
console.log("Starting WebSockets:", ws_host_url); console.log("Starting WebSockets:", ws_host_url);
this.ws = new this.WebSocket([ this.ws = new this.WebSocket([
that.ws_url, that.ws_url,
utils.url_path_join(that.kernel_url, 'channels'), utils.url_path_join(that.kernel_url, 'channels'),
@ -859,8 +861,16 @@ define([
var kernel = this; var kernel = this;
// clear display_id:msg_id map for display_ids associated with this msg_id // clear display_id:msg_id map for display_ids associated with this msg_id
callbacks.display_ids.map(function (display_id) { callbacks.display_ids.map(function (display_id) {
if (kernel._display_id_targets[display_id]) { var msg_ids = kernel._display_id_targets[display_id];
delete kernel._display_id_targets[display_id]; if (msg_ids) {
var idx = msg_ids.indexOf(msg_id);
if (idx === -1) {
return;
}
if (msg_ids.length === 1) {
delete kernel._display_id_targets[display_id];
}
kernel._display_id_targets[display_id] = msg_ids.splice(idx, 1);
} }
}); });
delete this._msg_callbacks[msg_id]; delete this._msg_callbacks[msg_id];
@ -1063,6 +1073,7 @@ define([
* @function _handle_output_message * @function _handle_output_message
*/ */
Kernel.prototype._handle_output_message = function (msg) { Kernel.prototype._handle_output_message = function (msg) {
var that = this;
var msg_id = msg.parent_header.msg_id; var msg_id = msg.parent_header.msg_id;
var callbacks = this.get_callbacks_for_msg(msg_id); var callbacks = this.get_callbacks_for_msg(msg_id);
if (['display_data', 'update_display_data'].indexOf(msg.header.msg_type) >= 0) { if (['display_data', 'update_display_data'].indexOf(msg.header.msg_type) >= 0) {
@ -1070,22 +1081,31 @@ define([
var display_id = (msg.content.transient || {}).display_id; var display_id = (msg.content.transient || {}).display_id;
if (display_id) { if (display_id) {
// it has a display_id // it has a display_id
var target_msg_id = this._display_id_targets[display_id]; var target_msg_ids = this._display_id_targets[display_id];
if (target_msg_id) { if (target_msg_ids) {
// we've seen it before, route to existing destination // we've seen it before, route to existing destination
callbacks = this.get_callbacks_for_msg(target_msg_id); target_msg_ids.map(function (target_msg_id) {
} else { var callbacks = that.get_callbacks_for_msg(target_msg_id);
if (msg.header.msg_type === 'update_display_data') { if (!callbacks) return;
// update_display with no target, ignore var callback = callbacks.iopub.output;
console.log("Nothing to update for display_id: %s", display_id); if (callback) {
return; callback(msg);
} }
// new display_id, record it for future updating });
// in display_id_targets for future lookup
this._display_id_targets[display_id] = msg_id;
// and in callbacks for cleanup on clear_callbacks_for_msg
callbacks.display_ids.push(display_id);
} }
// we're done here if it's update_display
if (msg.header.msg_type === 'update_display_data') {
// it's an update, don't proceed to the normal display
return;
}
// regular display_data with id, record it for future updating
// in display_id_targets for future lookup
if (this._display_id_targets[display_id] === undefined) {
this._display_id_targets[display_id] = [];
}
this._display_id_targets[display_id].push(msg_id);
// and in callbacks for cleanup on clear_callbacks_for_msg
callbacks.display_ids.push(display_id);
} }
} }