diff options
author | Nivesh Rajbhandari | 2012-05-15 14:19:12 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-05-15 14:19:12 -0700 |
commit | d8c7c8959f330c3a153aac65197cce54172275fc (patch) | |
tree | 222d7939f0ac4863b13fae288aa5c0a8da862749 /js/document/models | |
parent | 253b8803c71c88a6f87fb1caccd42fa081fc6eca (diff) | |
parent | 1d72a82a4c27a288e900eab99818222159ef8e23 (diff) | |
download | ninja-d8c7c8959f330c3a153aac65197cce54172275fc.tar.gz |
Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture
Diffstat (limited to 'js/document/models')
-rwxr-xr-x | js/document/models/base.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/js/document/models/base.js b/js/document/models/base.js index 0f58e75c..5f2a5893 100755 --- a/js/document/models/base.js +++ b/js/document/models/base.js | |||
@@ -138,6 +138,7 @@ exports.BaseDocumentModel = Montage.create(Component, { | |||
138 | file: this.file, | 138 | file: this.file, |
139 | webgl: this.webGlHelper.glData, | 139 | webgl: this.webGlHelper.glData, |
140 | styles: this.getStyleSheets(), | 140 | styles: this.getStyleSheets(), |
141 | template: this.fileTemplate, | ||
141 | document: this.views.design.iframe.contentWindow.document, | 142 | document: this.views.design.iframe.contentWindow.document, |
142 | head: this.views.design.iframe.contentWindow.document.head, | 143 | head: this.views.design.iframe.contentWindow.document.head, |
143 | body: this.views.design.iframe.contentWindow.document.body | 144 | body: this.views.design.iframe.contentWindow.document.body |
@@ -165,6 +166,7 @@ exports.BaseDocumentModel = Montage.create(Component, { | |||
165 | file: this.file, | 166 | file: this.file, |
166 | webgl: this.webGlHelper.glData, | 167 | webgl: this.webGlHelper.glData, |
167 | css: this.getStyleSheets(), | 168 | css: this.getStyleSheets(), |
169 | template: this.fileTemplate, | ||
168 | document: this.views.design.iframe.contentWindow.document, | 170 | document: this.views.design.iframe.contentWindow.document, |
169 | head: this.views.design.iframe.contentWindow.document.head, | 171 | head: this.views.design.iframe.contentWindow.document.head, |
170 | body: this.views.design.iframe.contentWindow.document.body | 172 | body: this.views.design.iframe.contentWindow.document.body |