diff options
author | Jon Reid | 2012-03-06 14:14:01 -0800 |
---|---|---|
committer | Jon Reid | 2012-03-06 14:14:01 -0800 |
commit | 60bba95eaffa8b5c741c6c85fb84b327cd75d6c3 (patch) | |
tree | 0087ad093418638ff1d0b4362715bd7b2d147eba /js/mediators | |
parent | d64f8c9fc1dd5fb15ad78ad61bed1ef3736321bb (diff) | |
parent | 342fb451bd251358068a0dcb10e9dc218b79a176 (diff) | |
download | ninja-60bba95eaffa8b5c741c6c85fb84b327cd75d6c3.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uber
Diffstat (limited to 'js/mediators')
-rw-r--r-- | js/mediators/io-mediator.js | 4 |
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 | // |