mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-30 12:11:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix handling of display_id repeats in a single output area

Browse Source
This commit is contained in:
Min RK 2016-11-08 12:00:13 -08:00
parent 5b2279c192
commit a7a30c3bde
2 changed files with 48 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
notebook/static/notebook/js/outputarea.js
View File

@ -225,7 +225,13 @@ define([
json.name = content.name;
break;
case "update_display_data":
// treat it like display_data
json.output_type = "display_data";
json.transient = content.transient || {};
json.transient._is_update = true;
json.data = content.data;
json.metadata = content.metadata;
break;
case "display_data":
json.transient = content.transient;
json.data = content.data;
@ -578,36 +584,51 @@ define([
OutputArea.prototype.append_display_data = function (json, handle_inserted) {
var toinsert = this.create_output_area();
var record = true;
var target;
var oa = this;
var update_targets;
var display_id = (json.transient || {}).display_id;
var is_update = (json.transient || {})._is_update;
if (is_update) {
// consume _is_update marker
delete json.transient._is_update;
}
var record = !is_update;
if (display_id) {
// it has a display_id;
target = this._display_id_targets[display_id];
if (target) {
update_targets = this._display_id_targets[display_id];
if (update_targets) {
// we've seen it before, update output data
this.outputs[target.index] = json;
record = false;
update_targets.map(function (target) {
oa.outputs[target.index] = json;
});
} else {
// not seen before, create and record new output area
target = this._display_id_targets[display_id] = {
update_targets = this._display_id_targets[display_id] = [{
index: this.outputs.length,
element: null
};
element: null,
}];
}
}
if (this.append_mime_type(json, toinsert, handle_inserted)) {
this._safe_append(toinsert, target && target.element);
if (target) {
if (update_targets) {
// updating multiple
update_targets.map(function (target) {
var toinsert = oa.create_output_area();
if (oa.append_mime_type(json, toinsert, handle_inserted)) {
oa._safe_append(toinsert, target.element);
}
target.element = toinsert;
});
} else {
var toinsert = this.create_output_area();
if (oa.append_mime_type(json, toinsert, handle_inserted)) {
oa._safe_append(toinsert);
}
// If we just output latex, typeset it.
if ((json.data[MIME_LATEX] !== undefined) ||
(json.data[MIME_HTML] !== undefined) ||
(json.data[MIME_MARKDOWN] !== undefined)) {
this.typeset();
}
}
// If we just output latex, typeset it.
if ((json.data[MIME_LATEX] !== undefined) ||
(json.data[MIME_HTML] !== undefined) ||
(json.data[MIME_MARKDOWN] !== undefined)) {
this.typeset();
}
return record;
};

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

@ -869,8 +869,10 @@ define([
}
if (msg_ids.length === 1) {
delete kernel._display_id_targets[display_id];
} else {
msg_ids.splice(idx, 1);
kernel._display_id_targets[display_id] = msg_ids;
}
kernel._display_id_targets[display_id] = msg_ids.splice(idx, 1);
}
});
delete this._msg_callbacks[msg_id];
@ -1076,14 +1078,14 @@ define([
var that = this;
var msg_id = msg.parent_header.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) > -1) {
// display_data messages may re-route based on their display_id
var display_id = (msg.content.transient || {}).display_id;
if (display_id) {
// it has a display_id
var target_msg_ids = this._display_id_targets[display_id];
if (target_msg_ids) {
// we've seen it before, route to existing destination
// we've seen it before, update existing outputs with same id
target_msg_ids.map(function (target_msg_id) {
var callbacks = that.get_callbacks_for_msg(target_msg_id);
if (!callbacks) return;
@ -1103,7 +1105,9 @@ define([
if (this._display_id_targets[display_id] === undefined) {
this._display_id_targets[display_id] = [];
}
this._display_id_targets[display_id].push(msg_id);
if (this._display_id_targets[display_id].indexOf(msg_id) === -1) {
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);
}