From 1cd89d4d06e3a8f2c221628b19cf26a2c69f5d3f Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Tue, 6 Mar 2012 11:24:25 -0800
Subject: Fixing WebGL not available bug

---
 js/document/html-document.js | 6 ++++--
 js/mediators/io-mediator.js  | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'js')

diff --git a/js/document/html-document.js b/js/document/html-document.js
index 5d507476..536fca47 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -668,7 +668,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
             			}
             		}
             	}
-    			return {mode: 'html', document: this._userDocument, webgl: this.glData, styles: styles, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
+    			//return {mode: 'html', document: this._userDocument, webgl: this.glData, styles: styles, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
+    			return {mode: 'html', document: this._userDocument, styles: styles, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
     		} else if (this.currentView === "code"){
     			//TODO: Would this get call when we are in code of HTML?
     		} else {
@@ -691,7 +692,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
             			}
             		}
             	}
-    			return {mode: 'html', document: this._userDocument, webgl: this.glData, css: css, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
+    			//return {mode: 'html', document: this._userDocument, webgl: this.glData, css: css, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
+    			return {mode: 'html', document: this._userDocument, css: css, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
     		} else if (this.currentView === "code"){
     			//TODO: Would this get call when we are in code of HTML?
     		} else {
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, {
     		switch (file.mode) {
     			case 'html':
     				//Copy webGL library if needed
-    				if (file.webgl.length > 0) {
+    				if (file.webgl && file.webgl.length > 0) {
     					for (var i in this.application.ninja.coreIoApi.ninjaLibrary.libs) {
 		    				//Checking for RDGE library to be available
 		    				if (this.application.ninja.coreIoApi.ninjaLibrary.libs[i].name === 'RDGE') {
@@ -308,7 +308,7 @@ exports.IoMediator = Montage.create(Component, {
     			}
     		}
     		//Checking for webGL elements in document
-    		if (template.webgl.length) {
+    		if (template.webgl && template.webgl.length) {
     			//
     			var json, matchingtags = [], webgltag, scripts = template.document.content.document.getElementsByTagName('script');
     			//
-- 
cgit v1.2.3