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

s/comm_id/model_id (left over from before)

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

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

@ -183,8 +183,12 @@ function(widget_manager, underscore, backbone){
// triggered on model change // triggered on model change
}, },
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
child_view: function(model_id, view_name) { child_view: function(model_id, view_name) {
=======
child_view: function(model_id, view_name, options) {
>>>>>>> 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 comm id for a model and (optionally) a view name
// if the view name is not given, it defaults to the model's default view attribute // 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_model = this.widget_manager.get_model(model_id);