diff options
| author | Valerio Virgillito | 2012-05-16 20:33:57 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-05-16 20:33:57 -0700 |
| commit | 9d001ec773c9568e9f825468631013fc9b20eb7e (patch) | |
| tree | 6eb6ed621c9d7e4faa9b0b8420e0fe43d48e8256 /js/document | |
| parent | f48bb7aa60a5eb1f9319ddd0334bd7a0afa2aca4 (diff) | |
| parent | d34c57638ef57fb9fedfdb8fa7add895bc585f8e (diff) | |
| download | ninja-9d001ec773c9568e9f825468631013fc9b20eb7e.tar.gz | |
Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into dom-architecture
Diffstat (limited to 'js/document')
| -rwxr-xr-x | js/document/models/base.js | 6 | ||||
| -rw-r--r-- | js/document/templates/html/main.js | 4 |
2 files changed, 6 insertions, 4 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/templates/html/main.js b/js/document/templates/html/main.js index f45657bb..ffa3fab2 100644 --- a/js/document/templates/html/main.js +++ b/js/document/templates/html/main.js | |||
| @@ -40,9 +40,9 @@ exports.Main = Montage.create(Component, { | |||
| 40 | 40 | ||
| 41 | }; | 41 | }; |
| 42 | // | 42 | // |
| 43 | window.mjsTemplateCreator = TemplateCreator.create(); | 43 | window.mjsTemplateCreator = TemplateCreator; |
| 44 | // | 44 | // |
| 45 | window.mjsTemplate = Template.create(); | 45 | window.mjsTemplate = Template; |
| 46 | 46 | ||
| 47 | 47 | ||
| 48 | // Dispatch event when this template has loaded. | 48 | // Dispatch event when this template has loaded. |