diff options
| author | Jonathan Duran | 2012-06-26 13:28:59 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-26 13:28:59 -0700 |
| commit | 42ea74de49cc9f06d8231b99c2ee6c65b0f8a61a (patch) | |
| tree | ad15f365ffae331ae76060a1ebdfc0f0f029725a /js/document/document-html.js | |
| parent | cdb5af99be5fca15265e4940dd22870f4c5fef4b (diff) | |
| parent | 87a8b62f71bb72274c3dd1fa389e88c12d482ebb (diff) | |
| download | ninja-42ea74de49cc9f06d8231b99c2ee6c65b0f8a61a.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
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") { |