diff options
author | Jose Antonio Marquez | 2012-06-01 15:28:27 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-06-01 15:28:27 -0700 |
commit | 5b4739d78618a40cacb0e127d1cc412fb839e441 (patch) | |
tree | 8761dbbd4f6e3883f8f3072127b90358ca0c19d3 /js/document/document-html.js | |
parent | 745c39fb9460e882f5c6c5cfeedc0b3edf85f8eb (diff) | |
parent | 4bb571a9551bba8a37bf3afd639412173d58bc71 (diff) | |
download | ninja-5b4739d78618a40cacb0e127d1cc412fb839e441.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Components
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 |