aboutsummaryrefslogtreecommitdiff
path: root/js/document/document-html.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-06-07 09:53:44 -0700
committerPushkar Joshi2012-06-07 09:53:44 -0700
commit1a40c4a3e1817004d1ce1c600ae4857fdd94a97a (patch)
tree25836d69f77472f60bab9a14c23865a3899a60d8 /js/document/document-html.js
parent763baf19f032c6fbae18963402b79d5d5510d923 (diff)
parent47e0e1f047e83b71c3f86812a45d33904201cc7a (diff)
downloadninja-1a40c4a3e1817004d1ce1c600ae4857fdd94a97a.tar.gz
Merge branch 'master' into brushtool
Diffstat (limited to 'js/document/document-html.js')
-rwxr-xr-xjs/document/document-html.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/js/document/document-html.js b/js/document/document-html.js
index 33a41a8e..c9acd2e0 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -68,6 +68,8 @@ exports.HtmlDocument = Montage.create(Component, {
68 if (this.model.views.design.initialize(this.model.parentContainer)) { 68 if (this.model.views.design.initialize(this.model.parentContainer)) {
69 //Hiding iFrame, just initiliazing 69 //Hiding iFrame, just initiliazing
70 this.model.views.design.hide(); 70 this.model.views.design.hide();
71 //Setting the iFrame property for reference in helper class
72 this.model.webGlHelper.iframe = this.model.views.design.iframe;
71 } else { 73 } else {
72 //ERROR: Design View not initialized 74 //ERROR: Design View not initialized
73 } 75 }
@@ -82,7 +84,7 @@ exports.HtmlDocument = Montage.create(Component, {
82 this.model.views.design.iframe.style.opacity = 0; 84 this.model.views.design.iframe.style.opacity = 0;
83 this.model.views.design.content = this.model.file.content; 85 this.model.views.design.content = this.model.file.content;
84 //TODO: Improve reference (probably through binding values) 86 //TODO: Improve reference (probably through binding values)
85 this.model.views.design.model = this.model; 87 this.model.views.design._webGlHelper = this.model.webGlHelper;
86 //Rendering design view, using observers to know when template is ready 88 //Rendering design view, using observers to know when template is ready
87 this.model.views.design.render(function () { 89 this.model.views.design.render(function () {
88 //Adding observer to know when template is ready 90 //Adding observer to know when template is ready