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

Moved the logic to get a cell by message id into the notebook.js.

Browse Source 
Also added more detail to the comments in the get output area function in widgets.js
This commit is contained in:
Jonathan Frederic 2013-11-15 18:18:53 +00:00
parent 215060e8e8
commit 48eaebf683
2 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
IPython/html/static/notebook/js/notebook.js
View File

@ -300,6 +300,24 @@ var IPython = (function (IPython) {
return result;
};
/**
* Try to get a particular cell by msg_id.
*
* @method get_msg_cell
* @param {String} msg_id A message UUID
* @return {Cell} Cell or null if no cell was found.
*/
Notebook.prototype.get_msg_cell = function (msg_id) {
var cells = this.get_cells();
for (var cell_index in cells) {
if (cells[cell_index].last_msg_id == msg_id) {
var cell = this.get_cell(cell_index)
return cell;
}
}
return null;
};
/**
* Count the cells in this notebook.
*

27
IPython/html/static/notebook/js/widget.js
View File

@ -298,25 +298,30 @@ define(["components/underscore/underscore-min",
// output_area is an instance of Ipython.OutputArea
_get_output_area: function (msg_id) {
// First, guess cell.execute triggered
var cells = IPython.notebook.get_cells();
for (var cell_index in cells) {
if (cells[cell_index].last_msg_id == msg_id) {
var cell = IPython.notebook.get_cell(cell_index)
return cell.output_area;
}
// First, check to see if the msg was triggered by cell execution.
var cell = IPython.notebook.get_msg_cell();
if (cell != null) {
return cell.output_area;
}
// Second, guess widget triggered
var callbacks = this.comm_manager.kernel.get_callbacks_for_msg(msg_id)
if (callbacks != undefined && callbacks.iopub != undefined && callbacks.iopub.get_output_area != undefined) {
// Second, check to see if a get_output_area callback was defined
// for the message. get_output_area callbacks are registered for
// widget messages, so this block is actually checking to see if the
// message was triggered by a widget.
var kernel = this.comm_manager.kernel;
var callbacks = kernel.get_callbacks_for_msg(msg_id);
if (callbacks != undefined &&
callbacks.iopub != undefined &&
callbacks.iopub.get_output_area != undefined) {
var output_area = callbacks.iopub.get_output_area();
if (output_area != null) {
return output_area;
}
}
// Not triggered by a widget or a cell
// Not triggered by a cell or widget (no get_output_area callback
// exists).
return null;
},