Show More
@@ -184,7 +184,11 b' function(widget_manager, underscore, backbone){' | |||||
184 | }, |
|
184 | }, | |
185 |
|
185 | |||
186 | <<<<<<< HEAD |
|
186 | <<<<<<< HEAD | |
|
187 | <<<<<<< HEAD | |||
187 | child_view: function(model_id, view_name) { |
|
188 | child_view: function(model_id, view_name) { | |
|
189 | ======= | |||
|
190 | child_view: function(model_id, view_name, options) { | |||
|
191 | >>>>>>> s/comm_id/model_id (left over from before) | |||
188 | // create and return a child view, given a comm id for a model and (optionally) a view name |
|
192 | // create and return a child view, given a comm id for a model and (optionally) a view name | |
189 | // if the view name is not given, it defaults to the model's default view attribute |
|
193 | // if the view name is not given, it defaults to the model's default view attribute | |
190 | var child_model = this.widget_manager.get_model(model_id); |
|
194 | var child_model = this.widget_manager.get_model(model_id); |
General Comments 0
You need to be logged in to leave comments.
Login now