diff options
| author | Jon Reid | 2012-06-26 14:58:10 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-26 14:58:10 -0700 |
| commit | 2599f74d72293b809929d8a0b36fb8e721f194cd (patch) | |
| tree | ca4cd45b23b8debea32f95d7dea807c77b6633b2 /js/document/document-html.js | |
| parent | ab9d14780eed98f39786fae4518e69861b34bad7 (diff) | |
| parent | e4304b9ac6c58802de4dd334be1f5802533f5160 (diff) | |
| download | ninja-2599f74d72293b809929d8a0b36fb8e721f194cd.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/document/document-html.js')
| -rwxr-xr-x | js/document/document-html.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/document/document-html.js b/js/document/document-html.js index b9c8e797..56f4e3d3 100755 --- a/js/document/document-html.js +++ b/js/document/document-html.js | |||
| @@ -106,7 +106,8 @@ exports.HtmlDocument = Montage.create(Component, { | |||
| 106 | } | 106 | } |
| 107 | }, | 107 | }, |
| 108 | handleViewReady: { | 108 | handleViewReady: { |
| 109 | value: function() { | 109 | value: function(mObjects) { |
| 110 | this.model.mObjects = mObjects; | ||
| 110 | // TODO: Find a better way to initialize this property | 111 | // TODO: Find a better way to initialize this property |
| 111 | // Assign the domContainer to be the document root on open | 112 | // Assign the domContainer to be the document root on open |
| 112 | if(typeof this.model.domContainer !== "undefined") { | 113 | if(typeof this.model.domContainer !== "undefined") { |