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

Updated comm id comments in view to model id

Browse Source
This commit is contained in:
Jonathan Frederic 2014-01-06 09:06:21 +00:00
parent 3329f875f3
commit 9e43807579
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -188,8 +188,12 @@ function(widget_manager, underscore, backbone){
child_view: function(model_id, view_name) {
=======
child_view: function(model_id, view_name, options) {
<<<<<<< HEAD
>>>>>>> s/comm_id/model_id (left over from before)
// create and return a child view, given a comm id for a model and (optionally) a view name
=======
// create and return a child view, given a model id for a model and (optionally) a view name
>>>>>>> Updated comm id comments in view to model id
// if the view name is not given, it defaults to the model's default view attribute
var child_model = this.widget_manager.get_model(model_id);
var child_view = this.widget_manager.create_view(child_model, view_name, this.cell);
@ -206,7 +210,7 @@ function(widget_manager, underscore, backbone){
},
update_child_views: function(old_list, new_list) {
// this function takes an old list and new list of comm ids
// this function takes an old list and new list of model ids
// views in child_views that correspond to deleted ids are deleted
// views corresponding to added ids are added child_views