aboutsummaryrefslogtreecommitdiff
path: root/js/mediators
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-06 14:11:41 -0800
committerValerio Virgillito2012-03-06 14:11:41 -0800
commitbd205dcf488ed160d4de33cbb15a528404fe86ef (patch)
tree8c116c891ebd622982b62e28139f9618a3583963 /js/mediators
parent4540b5b4ea2065c3e0d67b46bba8b6764801fbea (diff)
parent1cd89d4d06e3a8f2c221628b19cf26a2c69f5d3f (diff)
downloadninja-bd205dcf488ed160d4de33cbb15a528404fe86ef.tar.gz
Merge branch 'refs/heads/master' into panels
Diffstat (limited to 'js/mediators')
-rw-r--r--js/mediators/io-mediator.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index e763c67c..65218526 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -150,7 +150,7 @@ exports.IoMediator = Montage.create(Component, {
150 switch (file.mode) { 150 switch (file.mode) {
151 case 'html': 151 case 'html':
152 //Copy webGL library if needed 152 //Copy webGL library if needed
153 if (file.webgl.length > 0) { 153 if (file.webgl && file.webgl.length > 0) {
154 for (var i in this.application.ninja.coreIoApi.ninjaLibrary.libs) { 154 for (var i in this.application.ninja.coreIoApi.ninjaLibrary.libs) {
155 //Checking for RDGE library to be available 155 //Checking for RDGE library to be available
156 if (this.application.ninja.coreIoApi.ninjaLibrary.libs[i].name === 'RDGE') { 156 if (this.application.ninja.coreIoApi.ninjaLibrary.libs[i].name === 'RDGE') {
@@ -308,7 +308,7 @@ exports.IoMediator = Montage.create(Component, {
308 } 308 }
309 } 309 }
310 //Checking for webGL elements in document 310 //Checking for webGL elements in document
311 if (template.webgl.length) { 311 if (template.webgl && template.webgl.length) {
312 // 312 //
313 var json, matchingtags = [], webgltag, scripts = template.document.content.document.getElementsByTagName('script'); 313 var json, matchingtags = [], webgltag, scripts = template.document.content.document.getElementsByTagName('script');
314 // 314 //