mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2024-12-21 04:10:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Store views in the models and store child views in the views

Browse Source
This commit is contained in:
Jason Grout 2013-12-31 12:58:58 -07:00 committed by Jonathan Frederic
parent 7431fa37dd
commit 9a4c5957c3
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IPython/html/static/notebook/js/widgetmanager.js
View File

@ -98,8 +98,7 @@
if (ViewType !== undefined && ViewType !== null) {
var view = new ViewType({model: model, widget_manager: this, cell: cell});
view.render();
//this.views.push(view);
model.views.push(view);
/*
// jng: Handle when the view element is remove from the page.
// observe the view destruction event and do this. We may need

5
IPython/html/static/notebook/js/widgets/base.js
View File

@ -29,6 +29,7 @@ function(widget_manager, underscore, backbone){
this.msg_throttle = 3;
this.msg_buffer = null;
this.id = widget_id;
this.views = [];
if (comm !== undefined) {
// Remember comm associated with the model.
@ -43,7 +44,6 @@ function(widget_manager, underscore, backbone){
return Backbone.Model.apply(this);
},
send: function (content, callbacks) {
if (this.comm !== undefined) {
@ -55,6 +55,7 @@ function(widget_manager, underscore, backbone){
// Handle when a widget is closed.
_handle_comm_closed: function (msg) {
// jng: widget manager should observe the comm_close event and delete views when triggered
this.trigger('comm:close');
delete this.comm.model; // Delete ref so GC will collect widget model.
delete this.comm;
@ -178,6 +179,7 @@ function(widget_manager, underscore, backbone){
this.widget_manager = options.widget_manager;
this.comm_manager = options.widget_manager.comm_manager;
this.cell = options.cell;
this.child_views = [];
},
update: function(){
@ -187,6 +189,7 @@ function(widget_manager, underscore, backbone){
child_view: function(comm_id, view_name) {
var child_model = this.comm_manager.comms[comm_id].model;
var child_view = this.widget_manager.create_view(child_model, view_name, this.cell);
this.child_views.push(child_view);
return child_view;
},