aboutsummaryrefslogtreecommitdiff
path: root/js/document/document-html.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-01 15:27:30 -0700
committerValerio Virgillito2012-06-01 15:27:30 -0700
commit8433fa5ed0d4cc91e10b7080aa8edb8d94ccc1a4 (patch)
tree72d0501e670d5a6c6d14d29645452870b0b3f0f8 /js/document/document-html.js
parentef48a58da2c7d173605fd43e8f48dac5055c3fa1 (diff)
parent4bb571a9551bba8a37bf3afd639412173d58bc71 (diff)
downloadninja-8433fa5ed0d4cc91e10b7080aa8edb8d94ccc1a4.tar.gz
Merge branch 'refs/heads/master' into document-bindings-fix
Diffstat (limited to 'js/document/document-html.js')
-rwxr-xr-xjs/document/document-html.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/js/document/document-html.js b/js/document/document-html.js
index 8cc61026..33a41a8e 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