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

Merge pull request #6548 from SylvainCorlay/widget_views_by_id

Browse Source 
Make WidgetModel.views be an object indexed by view id
This commit is contained in:
Jonathan Frederic 2014-09-29 07:51:11 -04:00
commit b5195e1b17
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
IPython/html/static/widgets/js/widget.js
View File

@ -26,7 +26,7 @@ define(["widgets/js/manager",
this.msg_buffer = null;
this.state_lock = null;
this.id = model_id;
this.views = [];
this.views = {};
if (comm !== undefined) {
// Remember comm associated with the model.
@ -57,9 +57,11 @@ define(["widgets/js/manager",
delete this.comm.model; // Delete ref so GC will collect widget model.
delete this.comm;
delete this.model_id; // Delete id from model so widget manager cleans up.
_.each(this.views, function(view, i) {
view.remove();
});
for (var id in this.views) {
if (this.views.hasOwnProperty(id)) {
this.views[id].remove();
}
}
},
_handle_comm_msg: function (msg) {
@ -293,8 +295,8 @@ define(["widgets/js/manager",
this.options = parameters.options;
this.child_model_views = {};
this.child_views = {};
this.model.views.push(this);
this.id = this.id || IPython.utils.uuid();
this.model.views[this.id] = this;
this.on('displayed', function() {
this.is_displayed = true;
}, this);
@ -339,7 +341,7 @@ define(["widgets/js/manager",
var view = this.child_views[view_id];
delete this.child_views[view_id];
view_ids.splice(0,1);
child_model.views.pop(view);
delete child_model.views[view_id];
// Remove the view list specific to this model if it is empty.
if (view_ids.length === 0) {