diff options
author | Nivesh Rajbhandari | 2012-05-04 14:54:35 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-05-04 14:54:35 -0700 |
commit | ce2d581894f9e433a7b73e4b622352a657b6ddaa (patch) | |
tree | bbd4eb9f6d00ee9d3c0bcc53ce560cfc1e71127b /js/mediators | |
parent | 8f8f7f9a36fb9abadea2a9f25aef0084946bebc9 (diff) | |
parent | 8dcbac5d4c30e9dfbc543a5f997939111e9c9f89 (diff) | |
download | ninja-ce2d581894f9e433a7b73e4b622352a657b6ddaa.tar.gz |
Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture
Conflicts:
js/document/templates/montage-web/default_html.css
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/mediators')
-rw-r--r-- | js/mediators/io-mediator.js | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js index 057a849d..c20ae8f7 100644 --- a/js/mediators/io-mediator.js +++ b/js/mediators/io-mediator.js | |||
@@ -153,10 +153,6 @@ exports.IoMediator = Montage.create(Component, { | |||
153 | // | 153 | // |
154 | switch (file.mode) { | 154 | switch (file.mode) { |
155 | case 'html': | 155 | case 'html': |
156 | |||
157 | |||
158 | //TODO: Add check for Monatage library to copy | ||
159 | |||
160 | //Getting content from function to properly handle saving assets (as in external if flagged) | 156 | //Getting content from function to properly handle saving assets (as in external if flagged) |
161 | contents = this.parseNinjaTemplateToHtml(file); | 157 | contents = this.parseNinjaTemplateToHtml(file); |
162 | break; | 158 | break; |