diff options
author | Ananya Sen | 2012-02-17 14:26:56 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-17 14:26:56 -0800 |
commit | 2980816130a44cd478b2a9d6606e021efbcebd4a (patch) | |
tree | 762d98ba8852b858c03760f4b9bef294fae6486c /js/mediators/io-mediator.js | |
parent | 96178309ddcdb54c0c451b69ea6fb8cdf76fcf62 (diff) | |
parent | a42c536c2b3209afc058eabd31167bd0aa6f71c8 (diff) | |
download | ninja-2980816130a44cd478b2a9d6606e021efbcebd4a.tar.gz |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts:
css/ninja.css
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/mediators/io-mediator.js')
-rw-r--r-- | js/mediators/io-mediator.js | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js index 2008e40f..56869839 100644 --- a/js/mediators/io-mediator.js +++ b/js/mediators/io-mediator.js | |||
@@ -86,6 +86,7 @@ exports.IoMediator = Montage.create(Component, { | |||
86 | case 204: | 86 | case 204: |
87 | //Creating and formatting result object for callbak | 87 | //Creating and formatting result object for callbak |
88 | result = read.file.details; | 88 | result = read.file.details; |
89 | result.root = read.file.details.uri.replace(read.file.details.name, ""); | ||
89 | //Checking for type of content to returns | 90 | //Checking for type of content to returns |
90 | if (result.extension !== 'html' && result.extension !== 'htm') { | 91 | if (result.extension !== 'html' && result.extension !== 'htm') { |
91 | //Simple string | 92 | //Simple string |
@@ -142,6 +143,16 @@ exports.IoMediator = Montage.create(Component, { | |||
142 | // | 143 | // |
143 | switch (file.mode) { | 144 | switch (file.mode) { |
144 | case 'html': | 145 | case 'html': |
146 | //Copy webGL library if needed | ||
147 | if (file.webgl.length > 0) { | ||
148 | for (var i in this.application.ninja.coreIoApi.ninjaLibrary.libs) { | ||
149 | //if (this.application.ninja.coreIoApi.ninjaLibrary.libs[i].name === 'Assets' || this.application.ninja.coreIoApi.ninjaLibrary.libs[i].name === 'RDGE') { | ||
150 | if (this.application.ninja.coreIoApi.ninjaLibrary.libs[i].name === 'RDGE') { | ||
151 | this.application.ninja.coreIoApi.ninjaLibrary.copyLibToCloud(file.document.root, (this.application.ninja.coreIoApi.ninjaLibrary.libs[i].name+this.application.ninja.coreIoApi.ninjaLibrary.libs[i].version).toLowerCase()); | ||
152 | } | ||
153 | } | ||
154 | } | ||
155 | // | ||
145 | contents = this.parseNinjaTemplateToHtml(file); | 156 | contents = this.parseNinjaTemplateToHtml(file); |
146 | break; | 157 | break; |
147 | default: | 158 | default: |