From d5d4dcac78ebf8ba3163a8c7055d783b6397a435 Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Tue, 3 Apr 2012 12:55:54 -0700
Subject: Namespaced the canvas runtime file and updated all dependencies

---
 js/document/html-document.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/document')

diff --git a/js/document/html-document.js b/js/document/html-document.js
index 42a7d537..c9887b88 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -212,7 +212,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
 				{
 					/*
 					// Use this code to test the runtime version of WebGL
-					var cdm = new CanvasDataManager();
+					var cdm = new NinjaCvsRt.CanvasDataManager();
 					cdm.loadGLData(elt,  value,  null );
 					*/
 
-- 
cgit v1.2.3


From 18609d375e7aab9cb48c9b3f5b291f85cbd28683 Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Tue, 3 Apr 2012 13:39:32 -0700
Subject: removed old unused import and export functions.

---
 js/document/html-document.js | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'js/document')

diff --git a/js/document/html-document.js b/js/document/html-document.js
index c9887b88..953f909c 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -276,13 +276,6 @@ exports.HTMLDocument = Montage.create(TextDocument, {
 									var world = new GLWorld( canvas, useWebGL );
 									world.importJSON( jObj );
 								}
-								else
-								{
-									var index = importStr.indexOf( "webGL: " );
-									var useWebGL = (index >= 0);
-									var world = new GLWorld( canvas, useWebGL );
-									world.import( importStr );
-								}
 
 								this.buildShapeModel( canvas.elementModel, world );
 							}
@@ -432,7 +425,6 @@ exports.HTMLDocument = Montage.create(TextDocument, {
 			if (elt.elementModel && elt.elementModel.shapeModel && elt.elementModel.shapeModel.GLWorld)
 			{
 				var data = elt.elementModel.shapeModel.GLWorld.exportJSON();
-				//var data = elt.elementModel.shapeModel.GLWorld.export();
 				dataArray.push( data );
 			}
 
-- 
cgit v1.2.3


From 7433f0bfbc3a7ea44320550ed2c1d90dc5e6f170 Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Tue, 3 Apr 2012 16:27:01 -0700
Subject: Removed the dependence on an "assets" directory for the RDGE runtime.
 Now Ninja does not need to create duplicate files when it sets up the users
 Ninja Projects directory for RDGE support.

---
 js/document/html-document.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'js/document')

diff --git a/js/document/html-document.js b/js/document/html-document.js
index 953f909c..e96c9943 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -869,11 +869,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
     		//TODO: Add logic to handle save before preview
     		this.application.ninja.documentController.handleExecuteSaveAll(null);
     		//Temp check for webGL Hack
-    		if (this.application.ninja.documentController.activeDocument.glData.length && this.application.ninja.documentController.activeDocument.glData.length > 1) {//TODO: Should be 0, temp hack fix
-    			setTimeout(function () {window.open(this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController._activeDocument.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]);}.bind(this), 3500);
-    		} else {
-    			window.open(this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController._activeDocument.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]);
-    		}
+    		window.open(this.application.ninja.coreIoApi.rootUrl + this.application.ninja.documentController._activeDocument.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]);
     		//chrome.tabs.create({url: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController._activeDocument.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]});		
     	}
     },
-- 
cgit v1.2.3