diff options
author | Valerio Virgillito | 2012-02-20 15:40:04 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-20 15:40:04 -0800 |
commit | f6811b8b7e86bcae16f9278b5a7cfc1ea94e3909 (patch) | |
tree | 7d12d3aca26e15fac2072498d42e2f7478f72719 /js/mediators/io-mediator.js | |
parent | 7ec06098dcfa969017b73b91a1eec810d05775f8 (diff) | |
parent | bd7bc833895391e4974b8746f31f63ba70689df3 (diff) | |
download | ninja-f6811b8b7e86bcae16f9278b5a7cfc1ea94e3909.tar.gz |
Merge branch 'refs/heads/master' into nested-selection
Diffstat (limited to 'js/mediators/io-mediator.js')
-rw-r--r-- | js/mediators/io-mediator.js | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js index e9958ec3..56869839 100644 --- a/js/mediators/io-mediator.js +++ b/js/mediators/io-mediator.js | |||
@@ -143,6 +143,16 @@ exports.IoMediator = Montage.create(Component, { | |||
143 | // | 143 | // |
144 | switch (file.mode) { | 144 | switch (file.mode) { |
145 | 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 | // | ||
146 | contents = this.parseNinjaTemplateToHtml(file); | 156 | contents = this.parseNinjaTemplateToHtml(file); |
147 | break; | 157 | break; |
148 | default: | 158 | default: |
@@ -192,17 +202,6 @@ exports.IoMediator = Montage.create(Component, { | |||
192 | // | 202 | // |
193 | template.document.content.document.body.innerHTML = template.body; | 203 | template.document.content.document.body.innerHTML = template.body; |
194 | template.document.content.document.head.innerHTML = template.head; | 204 | template.document.content.document.head.innerHTML = template.head; |
195 | // | ||
196 | if (template.webgl.length > 0) { | ||
197 | for (var i in this.application.ninja.coreIoApi.ninjaLibrary.libs) { | ||
198 | if (this.application.ninja.coreIoApi.ninjaLibrary.libs[i].name === 'Assets' || this.application.ninja.coreIoApi.ninjaLibrary.libs[i].name === 'RDGE') { | ||
199 | this.application.ninja.coreIoApi.ninjaLibrary.copyLibToCloud(template.document.root, (this.application.ninja.coreIoApi.ninjaLibrary.libs[i].name+this.application.ninja.coreIoApi.ninjaLibrary.libs[i].version).toLowerCase()); | ||
200 | } | ||
201 | } | ||
202 | |||
203 | //this.application.ninja.coreIoApi.ninjaLibrary.copyLibToCloud(path, libname); | ||
204 | //console.log(this.application.ninja.coreIoApi.ninjaLibrary.libs); | ||
205 | } | ||
206 | //TODO: Remove temp fix for styles | 205 | //TODO: Remove temp fix for styles |
207 | if (template.style) { | 206 | if (template.style) { |
208 | template.document.content.document.head.getElementsByTagName('style')[0].innerHTML = this.getCssFromRules(template.style.cssRules); | 207 | template.document.content.document.head.getElementsByTagName('style')[0].innerHTML = this.getCssFromRules(template.style.cssRules); |