From 27c1ba250a7db26cf24dd456d20af9ff1649e638 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Mon, 23 Apr 2012 17:04:48 -0700
Subject: canvas interaction

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

(limited to 'js/document/html-document.js')

diff --git a/js/document/html-document.js b/js/document/html-document.js
index 2531465d..cce88747 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -228,7 +228,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
 					{
 						// JSON format.  pull off the
 						importStr = importStr.substr( index+1 );
-						jObj = jObj = JSON.parse( importStr );
+						jObj = JSON.parse( importStr );
 						id = jObj.id;
 					}
 					else
-- 
cgit v1.2.3


From 4b83774cdbfbf30add9a8fa2f11b1c4ff35179fa Mon Sep 17 00:00:00 2001
From: hwc487
Date: Thu, 26 Apr 2012 12:50:57 -0700
Subject: canvas interaction

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

(limited to 'js/document/html-document.js')

diff --git a/js/document/html-document.js b/js/document/html-document.js
index ff5192b3..454b7154 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -207,16 +207,16 @@ exports.HTMLDocument = Montage.create(TextDocument, {
 			var elt = this.documentRoot;
 			if (elt)
 			{
+				/*
+				// Use this code to test the runtime version of WebGL
+				var cdm = new NinjaCvsRt.CanvasDataManager();
+				cdm.loadGLData(elt,  value,  null );
+				*/
+
+				// /*
 				var nWorlds= value.length;
 				for (var i=0;  i<nWorlds;  i++)
 				{
-					/*
-					// Use this code to test the runtime version of WebGL
-					var cdm = new NinjaCvsRt.CanvasDataManager();
-					cdm.loadGLData(elt,  value,  null );
-					*/
-
-					// /*
 					// get the data for the next canvas
 					var importStr = value[i];
 
@@ -281,8 +281,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
 							}
 						}
 					}
-					// */
 				}
+				// */
 			}
 		}
     },
-- 
cgit v1.2.3


From 1ccc4d6dcff232b00763a5a49d7ad7a91f78ad3f Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Thu, 26 Apr 2012 13:24:51 -0700
Subject: Fixing the element model and adding get element

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/document/html-document.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'js/document/html-document.js')

diff --git a/js/document/html-document.js b/js/document/html-document.js
index 3876670c..3dbf96ce 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -759,10 +759,14 @@ exports.HTMLDocument = Montage.create(TextDocument, {
 					//TODO Finish this implementation once we start caching Core Elements
 					// Assign a model to the UserContent and add the ViewPort reference to it.
 					NJUtils.makeElementModel(this.documentRoot, "Stage", "stage");
-					//this.documentRoot.elementModel.viewPort = this.iframe.contentWindow.document.getElementById("Viewport");
-					NJUtils.makeElementModel(this.stageBG, "Stage", "stage");
+                    NJUtils.makeElementModel(this.stageBG, "Stage", "stage");
 					NJUtils.makeElementModel(this.iframe.contentWindow.document.getElementById("Viewport"), "Stage", "stage");
-					 
+
+                    // Initialize the 3D properties
+                    this.documentRoot.elementModel.props3D.init(this.documentRoot, true);
+                    this.stageBG.elementModel.props3D.init(this.stageBG, true);
+                    this.iframe.contentWindow.document.getElementById("Viewport").elementModel.props3D.init(this.iframe.contentWindow.document.getElementById("Viewport"), true);
+
 					for(i = 0; i < this._stylesheets.length; i++) {
 						if(this._stylesheets[i].ownerNode.id === this._stageStyleSheetId) {
 							this.documentRoot.elementModel.defaultRule = this._stylesheets[i];
-- 
cgit v1.2.3