diff options
author | Nivesh Rajbhandari | 2012-05-17 11:10:15 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-05-17 11:10:15 -0700 |
commit | 3d36ca3feb7a2cabd7d64335b2417637bd9aa906 (patch) | |
tree | b89119d747de0c7333a8cbde4a7689c5fb102d5c /js/document/models | |
parent | 2ba4a6fab3b81b537521760ee5f95f1bc80027f9 (diff) | |
parent | 0e8ca026098e7abfaeb642643a21977490782922 (diff) | |
download | ninja-3d36ca3feb7a2cabd7d64335b2417637bd9aa906.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 | 6 | ||||
-rwxr-xr-x | js/document/models/html.js | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/js/document/models/base.js b/js/document/models/base.js index 033e16f6..649539ea 100755 --- a/js/document/models/base.js +++ b/js/document/models/base.js | |||
@@ -149,7 +149,8 @@ exports.BaseDocumentModel = Montage.create(Component, { | |||
149 | template: this.fileTemplate, | 149 | template: this.fileTemplate, |
150 | document: this.views.design.iframe.contentWindow.document, | 150 | document: this.views.design.iframe.contentWindow.document, |
151 | head: this.views.design.iframe.contentWindow.document.head, | 151 | head: this.views.design.iframe.contentWindow.document.head, |
152 | body: this.views.design.iframe.contentWindow.document.body | 152 | body: this.views.design.iframe.contentWindow.document.body, |
153 | mjsTemplateCreator: this.views.design.iframe.contentWindow.mjsTemplateCreator | ||
153 | }, callback.bind(this)); | 154 | }, callback.bind(this)); |
154 | } else { | 155 | } else { |
155 | //TODO: Add logic to save code view data | 156 | //TODO: Add logic to save code view data |
@@ -177,7 +178,8 @@ exports.BaseDocumentModel = Montage.create(Component, { | |||
177 | template: this.fileTemplate, | 178 | template: this.fileTemplate, |
178 | document: this.views.design.iframe.contentWindow.document, | 179 | document: this.views.design.iframe.contentWindow.document, |
179 | head: this.views.design.iframe.contentWindow.document.head, | 180 | head: this.views.design.iframe.contentWindow.document.head, |
180 | body: this.views.design.iframe.contentWindow.document.body | 181 | body: this.views.design.iframe.contentWindow.document.body, |
182 | mjsTemplateCreator: this.views.design.iframe.contentWindow.mjsTemplateCreator | ||
181 | }, callback.bind(this)); | 183 | }, callback.bind(this)); |
182 | } else { | 184 | } else { |
183 | //TODO: Add logic to save code view data | 185 | //TODO: Add logic to save code view data |
diff --git a/js/document/models/html.js b/js/document/models/html.js index b57ff832..67457863 100755 --- a/js/document/models/html.js +++ b/js/document/models/html.js | |||
@@ -17,6 +17,11 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, { | |||
17 | hasTemplate: { | 17 | hasTemplate: { |
18 | value: false | 18 | value: false |
19 | }, | 19 | }, |
20 | //////////////////////////////////////////////////////////////////// | ||
21 | // | ||
22 | selection: { | ||
23 | value: [] | ||
24 | }, | ||
20 | //////////////////////////////////////////////////////////////////// | 25 | //////////////////////////////////////////////////////////////////// |
21 | // | 26 | // |
22 | draw3DGrid: { | 27 | draw3DGrid: { |