diff options
author | hwc487 | 2012-06-04 09:15:12 -0700 |
---|---|---|
committer | hwc487 | 2012-06-04 09:15:12 -0700 |
commit | 3f5351c5d75080727953caf5d8d9a312c1c9391b (patch) | |
tree | dcbc2db4e137e115b43a6117331ed1176f85904b /js/document/document-html.js | |
parent | 4aacbf5d3c7a42a3621eb3ae2723542a455e7720 (diff) | |
parent | 3abba04025dbc0daadb08184833a2558c442b8e1 (diff) | |
download | ninja-3f5351c5d75080727953caf5d8d9a312c1c9391b.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/document/document-html.js')
-rwxr-xr-x | js/document/document-html.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/js/document/document-html.js b/js/document/document-html.js index c60a12a2..b5684dc5 100755 --- a/js/document/document-html.js +++ b/js/document/document-html.js | |||
@@ -62,6 +62,8 @@ exports.HtmlDocument = Montage.create(Component, { | |||
62 | parentContainer: {value: document.getElementById("iframeContainer")}, //Saving reference to parent container of all views (should be changed to buckets approach | 62 | parentContainer: {value: document.getElementById("iframeContainer")}, //Saving reference to parent container of all views (should be changed to buckets approach |
63 | views: {value: {'design': DesignDocumentView.create(), 'code': null}} //TODO: Add code view logic | 63 | views: {value: {'design': DesignDocumentView.create(), 'code': null}} //TODO: Add code view logic |
64 | }); | 64 | }); |
65 | //Calling the any init routines in the model | ||
66 | this.model.init(); | ||
65 | //Initiliazing views and hiding | 67 | //Initiliazing views and hiding |
66 | if (this.model.views.design.initialize(this.model.parentContainer)) { | 68 | if (this.model.views.design.initialize(this.model.parentContainer)) { |
67 | //Hiding iFrame, just initiliazing | 69 | //Hiding iFrame, just initiliazing |