Show More
@@ -78,7 +78,7 b'' | |||
|
78 | 78 | console.log("Could not determine where the display" + |
|
79 | 79 | " message was from. Widget will not be displayed"); |
|
80 | 80 | } else { |
|
81 |
var view = this.create_view(model |
|
|
81 | var view = this.create_view(model); | |
|
82 | 82 | if (view !== undefined |
|
83 | 83 | && cell.widget_subarea !== undefined |
|
84 | 84 | && cell.widget_subarea !== null) { |
@@ -94,6 +94,7 b'' | |||
|
94 | 94 | |
|
95 | 95 | <<<<<<< HEAD |
|
96 | 96 | <<<<<<< HEAD |
|
97 | <<<<<<< HEAD | |
|
97 | 98 | WidgetManager.prototype.create_view = function(model, view_name, cell) { |
|
98 | 99 | ======= |
|
99 | 100 | WidgetManager.prototype.create_view = function(model, view_name, options) { |
@@ -106,6 +107,10 b'' | |||
|
106 | 107 | >>>>>>> Add widget view options in creating child views |
|
107 | 108 | var ViewType = this.widget_view_types[view_name]; |
|
108 | 109 | ======= |
|
110 | ======= | |
|
111 | WidgetManager.prototype.create_view = function(model, options) { | |
|
112 | var view_name = model.get('view_name'); | |
|
113 | >>>>>>> remove msg.content.data.view_name and corrosponding create_view param | |
|
109 | 114 | var ViewType = this._view_types[view_name]; |
|
110 | 115 | >>>>>>> _model_types, _view_types, _models - and document what keys and values are |
|
111 | 116 | if (ViewType !== undefined && ViewType !== null) { |
@@ -114,6 +119,7 b'' | |||
|
114 | 119 | model.views.push(view); |
|
115 | 120 | model.on('destroy', view.remove, view); |
|
116 | 121 | <<<<<<< HEAD |
|
122 | <<<<<<< HEAD | |
|
117 | 123 | /* |
|
118 | 124 | // TODO: handle view deletion. Don't forget to delete child views |
|
119 | 125 | var that = this; |
@@ -160,6 +166,8 b'' | |||
|
160 | 166 | delete that.model_id; // Delete id from model so widget manager cleans up. |
|
161 | 167 | }); |
|
162 | 168 | */ |
|
169 | ======= | |
|
170 | >>>>>>> remove msg.content.data.view_name and corrosponding create_view param | |
|
163 | 171 | return view; |
|
164 | 172 | } |
|
165 | 173 | }, |
General Comments 0
You need to be logged in to leave comments.
Login now