diff options
author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
tree | 867f8bdd588c8f9076979233ca46a688ff70523e /js/mediators/io-mediator.js | |
parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/mediators/io-mediator.js')
-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; |