From 46defc9bd11bf077efd672c72787a3b67da1a178 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Mon, 12 Mar 2012 14:59:08 -0700
Subject: Uber material changes for IO

---
 .../RDGE/src/core/script/MeshManager.js            |   2 +-
 .../RDGE/src/core/script/run_state.js              |  16 +--
 js/lib/geom/geom-obj.js                            |   6 +-
 js/lib/rdge/materials/flat-material.js             |   6 -
 js/lib/rdge/materials/uber-material.js             | 122 ++++++++++++++++++---
 5 files changed, 121 insertions(+), 31 deletions(-)

(limited to 'js')

diff --git a/js/helper-classes/RDGE/src/core/script/MeshManager.js b/js/helper-classes/RDGE/src/core/script/MeshManager.js
index 43813078..7dfc79d4 100755
--- a/js/helper-classes/RDGE/src/core/script/MeshManager.js
+++ b/js/helper-classes/RDGE/src/core/script/MeshManager.js
@@ -69,7 +69,7 @@ MeshManager.prototype.deleteMesh = function (name)
 	if (model)
 	{
 		g_Engine.ctxMan.forEach(function(context)
-		{
+		{
 			context.renderer.deletePrimitive(model.primitive);
 		});
 
diff --git a/js/helper-classes/RDGE/src/core/script/run_state.js b/js/helper-classes/RDGE/src/core/script/run_state.js
index acdb6797..a5981caa 100755
--- a/js/helper-classes/RDGE/src/core/script/run_state.js
+++ b/js/helper-classes/RDGE/src/core/script/run_state.js
@@ -30,9 +30,9 @@ RunState.prototype.Init = function()
 		this.userRunState.init();
 	}
 
-	if (this.hasUserState && this.userRunState && this.userRunState.onRunState)
-		this.userRunState.onRunState();
-
+	if (this.hasUserState && this.userRunState && this.userRunState.onRunState)
+		this.userRunState.onRunState();
+
 
 	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -97,11 +97,11 @@ RunState.prototype.ReInit = function()
 	if(!this.initialized)
 	{
 		this.Init();
-	}
-	else
-	{
-		if (this.hasUserState && this.userRunState && this.userRunState.onRunState)
-			this.userRunState.onRunState();
+	}
+	else
+	{
+		if (this.hasUserState && this.userRunState && this.userRunState.onRunState)
+			this.userRunState.onRunState();
 	}
 }
 
diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index 1a197832..35ebadb9 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -285,9 +285,11 @@ var GeomObj = function GLGeomObj() {
 			if (mat)
 				mat.import( importStr );
 
-			var endIndex = importStr.indexOf( "endMaterial\n" );
+			// pull off the end of the material 
+			var endMat = "endMaterial\n";
+			var endIndex = importStr.indexOf( endMat );
 			if (endIndex < 0)  break;
-			importStr = importStr.substr( endIndex );
+			importStr = importStr.substr( endIndex + endMat.length );
 		}
 	}
 
diff --git a/js/lib/rdge/materials/flat-material.js b/js/lib/rdge/materials/flat-material.js
index 97e4f646..fff0e68e 100755
--- a/js/lib/rdge/materials/flat-material.js
+++ b/js/lib/rdge/materials/flat-material.js
@@ -102,13 +102,7 @@ var FlatMaterial = function FlatMaterial() {
         try
         {
             var color  = eval( "[" + pu.nextValue( "color: " ) + "]" );
-
             this.setProperty( "color",  color);
-
-            var endKey = "endMaterial\n";
-            var index = importStr.indexOf( endKey );
-            index += endKey.length;
-            rtnStr = importStr.substr( index );
         }
         catch (e)
         {
diff --git a/js/lib/rdge/materials/uber-material.js b/js/lib/rdge/materials/uber-material.js
index 655d8e2a..8ec5b05c 100755
--- a/js/lib/rdge/materials/uber-material.js
+++ b/js/lib/rdge/materials/uber-material.js
@@ -4,6 +4,7 @@
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
 
+var MaterialParser = require("js/lib/rdge/materials/material-parser").MaterialParser;
 var Material = require("js/lib/rdge/materials/material").Material;
 
 var UberMaterial = function UberMaterial() {
@@ -375,19 +376,111 @@ var UberMaterial = function UberMaterial() {
         var endKey = "endMaterial\n";
         var index = importStr.indexOf( endKey );
         index += endKey.length;
-        importStr = importStr.substr( index );
+        importStr = importStr.slice( 0, index );
 		var pu = new MaterialParser( importStr );
 
 		var matProps = pu.nextValue( "materialProps: " );
 		if (matProps)
 		{
-			var ambientColor  = Number( pu.nextValue( "ambientColor: "  ));	 this.setProperty( "ambientColor", ambientColor );
-			var diffuseColor  = Number( pu.nextValue( "diffuseColor: "  ));	 this.setProperty( "diffuseColor", diffuseColor );
-			var specularColor = Number( pu.nextValue( "specularColor: " ));	 this.setProperty( "specularColor", specularColor );
-			var specularPower = Number( pu.nextValue( "specularPower: " ));  this.setProperty( "specularPower", specularPower );
+			var ambientColor  = eval( "[" + pu.nextValue("ambientColor: ")   + ']' );	 this.setProperty( "ambientColor", ambientColor );
+			var diffuseColor  = eval( "[" + pu.nextValue( "diffuseColor: ")  + ']' );	 this.setProperty( "diffuseColor", diffuseColor );
+			var specularColor = eval( "[" + pu.nextValue( "specularColor: ") + ']' );	 this.setProperty( "specularColor", specularColor );
+			var specularPower = eval( "[" + pu.nextValue( "specularPower: ") + ']' );    this.setProperty( "specularPower", specularPower );
 		}
 
-		var lightProps = pu.nextValue( "theLights" );
+		var lightProps = pu.nextValue( "lightProps: " );
+		if (lightProps)
+		{
+			this._lights = [];
+			var lightStr;
+			for (var i=0;  i<this._MAX_LIGHTS;  i++)
+			{
+				var type = pu.nextValue( "light" + i + ": " );
+				if (type)
+				{
+						var light = new Object;
+						switch (type)
+						{
+							case "directional":
+								lightStr = pu.nextValue( 'light' + i + 'Dir: ');
+								light.direction = eval( "[" + lightStr + "]" );
+								break;
+
+							case "spot":
+								lightStr = pu.nextValue( 'light' + i + 'Pos: ' );
+								light.position =  eval( "[" + lightStr + "]" );
+
+								lightStr = pu.nextValue( 'light' + i + 'OuterSpotCutoff: ' );
+								light['spotInnerCutoff'] = Number( lightStr );
+
+								lightStr = pu.nextValue( 'light' + i + 'InnerSpotCutoff: ' );
+								light['spotOuterCutoff'] = Number( lightStr );
+								break;
+
+							case "point":
+								lightStr = pu.nextValue( 'light' + i + 'Pos: ' );
+								light.position =  eval( "[" + lightStr + "]" );
+
+								lightStr = pu.nextValue( 'light' + i + 'Attenuation: ' );
+								light.attenuation =  eval( "[" + lightStr + "]" );
+								break;
+
+							default:
+								throw new Error( "unrecognized light type on import: " + type );
+								break;
+						}
+
+						// common to all lights
+						light.diffuseColor = eval( "[" + pu.nextValue( 'light' + i + 'Color: ') + "]" );
+						light.specularColor = eval( "[" + pu.nextValue( 'light' + i + 'SpecularColor: ') + "]" );
+
+						// push the light
+						this._lights.push( light );
+				}
+				else
+					this._lights[i] = 'undefined';
+
+				// advance to the next light
+				var endLightKey = "endMaterial\n";
+				index = importStr.indexOf( endLightKey );
+				if (index < 0)  throw new Error( "ill-formed light encountered in import" );
+				index += endLightKey.length;
+				importStr = importStr.slice( 0, index );
+
+			}
+
+			if (this._lights.length > 0)
+			{
+				this._ubershaderCaps.lighting =
+				{
+					'light0' : this._lights[0],
+					'light1' : this._lights[1],
+					'light2' : this._lights[2],        
+					'light3' : this._lights[3]                                     
+				}
+			}
+		}
+
+		var diffuseMap = pu.nextValue( "diffuseMap: "  )
+		if(diffuseMap)
+			this.setProperty( "diffuseMap", diffuseMap );
+
+		var normalMap = pu.nextValue( "normalMap: "  );
+		if(normalMap)
+			this.setProperty( "normalMap", normalMap );
+
+		var specularMap = pu.nextValue( "specularMap: "  );
+		if(specularMap)
+			this.setProperty( "specularMap", specularMap );
+
+		var environmentMap = pu.nextValue( "environmentMap: "  );
+		if(environmentMap)
+		{
+			this.setProperty( "environmentMap", environmentMap );
+			this.setProperty( "environmentAmount", Number( pu.nextValue( "envReflection" ) ) );
+		}
+
+		this.rebuildShader();
 	}
 
 	this.export = function()
@@ -428,20 +521,18 @@ var UberMaterial = function UberMaterial() {
 					else if (light.type === 'spot')
 					{
 						exportStr += 'light' + i + 'Pos: ' + light['position'] + '\n';
-
-						var deg2Rad = Math.PI / 180;
-						exportStr += 'light' + i + 'Spot: ' + [ Math.cos( ( light['spotInnerCutoff'] || 45.0 )  * deg2Rad ), 
-																Math.cos( ( light['spotOuterCutoff'] || 90.0 ) * deg2Rad )] + '\n';
+						exportStr += 'light' + i + 'SpotInnerCutoff: ' + light['spotInnerCutoff'] + '\n';
+						exportStr += 'light' + i + 'SpotOuterCutoff: ' + light['spotOuterCutoff'] + '\n';
 					}
 					else		// light.type === 'point'
 					{
-						exportStr += 'light' + i + 'Pos: ' + (light['position'] || [ 0, 0, 0 ]) ;
-						exportStr += 'light' + i + 'Attenuation: ' + (light['attenuation'] || [ 1, 0, 0 ]) ;
+						exportStr += 'light' + i + 'Pos: ' + (light['position'] || [ 0, 0, 0 ]) + '\n';
+						exportStr += 'light' + i + 'Attenuation: ' + (light['attenuation'] || [ 1, 0, 0 ]) + '\n';
 					}
 
 					// common to all lights
-					exportStr += 'light' + i + 'Color: ' + light['diffuseColor'] || [ 1,1,1,1 ] + '\n';
-					exportStr += 'light' + i + 'SpecularColor: ' + light['specularColor'] || [ 1, 1, 1, 1 ] + '\n'; 
+					exportStr += 'light' + i + 'Color: ' + (light['diffuseColor'] || [ 1,1,1,1 ]) + '\n';
+					exportStr += 'light' + i + 'SpecularColor: ' + (light['specularColor'] || [ 1, 1, 1, 1 ]) + '\n'; 
 					
 					exportStr += "endlight\n";          
 				}
@@ -466,7 +557,10 @@ var UberMaterial = function UberMaterial() {
 			exportStr += "specularMap: " + caps.specularMap.texture + "\n";
 
 		if(typeof caps.environmentMap != 'undefined')
+		{
 			exportStr += "environmentMap: " + caps.environmentMap.texture + "\n";
+			exportStr += "envReflection: " + caps.environmentMap.envReflection + "\n";
+		}
 		
 		// every material needs to terminate like this
 		exportStr += "endMaterial\n";
-- 
cgit v1.2.3


From 9b40878fcc82d3ec08361e30d2029de261f0f80e Mon Sep 17 00:00:00 2001
From: hwc487
Date: Tue, 13 Mar 2012 16:32:46 -0700
Subject: Fixed BumpMetal material

---
 js/document/html-document.js      | 12 +++++--
 js/helper-classes/3D/vec-utils.js | 71 ++++++++++++++++++++++++++++++++++++++-
 2 files changed, 80 insertions(+), 3 deletions(-)

(limited to 'js')

diff --git a/js/document/html-document.js b/js/document/html-document.js
index 051490f5..f4ec3184 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -207,9 +207,17 @@ exports.HTMLDocument = Montage.create(TextDocument, {
 		},
         set: function(value) {
 			var elt = this.documentRoot;
-			if (elt) {
+			if (elt)
+			{
 				var nWorlds= value.length;
-				for (var i=0;  i<nWorlds;  i++) {
+				for (var i=0;  i<nWorlds;  i++)
+				{
+					/*
+					// Use this code to test the runtime version of WebGL
+					var cdm = new CanvasDataManager();
+					cdm.loadGLData(elt,  value,  null );
+					*/
+
 					var importStr = value[i];
 					var startIndex = importStr.indexOf( "id: " );
 					if (startIndex >= 0) {
diff --git a/js/helper-classes/3D/vec-utils.js b/js/helper-classes/3D/vec-utils.js
index 3db95ab7..e6db4a8d 100755
--- a/js/helper-classes/3D/vec-utils.js
+++ b/js/helper-classes/3D/vec-utils.js
@@ -191,5 +191,74 @@ var VecUtils = exports.VecUtils = Object.create(Object.prototype,
 
             return vec;
         }
-    }
+    },
+
+	matI :
+	{
+		value: function(dimen)
+		{
+			var mat = [];
+			for (var i=0;  i<dimen*dimen;  i++)  mat.push(0);
+
+			var index = 0;
+			for (var i=0;  i<dimen;  i++)
+			{
+				mat[index] = 1.0;
+				index += dimen + 1;
+			}
+	
+			return mat;	
+		}
+	},
+
+	matTranslation:
+	{
+		value: function (vec)
+		{
+			var mat = Matrix.I(4);
+			glmat4.translate(mat, vec);
+			return mat;
+		}
+	},
+
+	matRotationX:
+	{
+		value: function( angle )
+		{
+			var mat = Matrix.I(4);
+			glmat4.rotateX(mat, angle);
+			return mat;
+		}
+	},
+
+	matRotationY:
+	{
+		value: function( angle )
+		{
+			var mat = Matrix.I(4);
+			glmat4.rotateY(mat, angle);
+			return mat;
+		}
+	},
+
+	matRotationZ:
+	{
+		value: function( angle )
+		{
+			var mat = Matrix.I(4);
+			glmat4.rotateZ(mat, angle);
+			return mat;
+		}
+	},
+
+	matRotation:
+	{
+		value: function(angle, axis)
+		{
+			var mat = Matrix.I(4);
+			glmat4.rotate(mat, angle, axis);
+			return mat;
+		}
+	},
+
 });
\ No newline at end of file
-- 
cgit v1.2.3


From e07ec7dd1a4b8df747f6af0d54fe95e3a237f0c8 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Wed, 14 Mar 2012 11:47:06 -0700
Subject: Removing the name attribute from the PI. Fixing the ID and Class
 attribute from the PI

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/controllers/elements/element-controller.js | 17 -------
 js/panels/properties.reel/properties.html     | 70 +++++----------------------
 js/panels/properties.reel/properties.js       | 64 ++++++++++++------------
 3 files changed, 47 insertions(+), 104 deletions(-)

(limited to 'js')

diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index 9f00604f..70aba54e 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -51,23 +51,6 @@ var ElementController = exports.ElementController = Montage.create(NJComponent,
 
     setAttribute: {
         value: function(el, att, value) {
-            if(att === "id") {
-                if(value === "") {
-                    el.setAttribute(att, value);
-                    return;
-                }
-
-                // Then check if this is a valid id by the following spec: http://www.w3.org/TR/REC-html40/types.html#h-6.2
-                var regexID = /^([a-zA-Z])+([a-zA-Z0-9_\.\:\-])+/;
-                if(!regexID.test(value)) {
-                    alert("Invalid ID");
-                    return;
-                } else if (this.application.ninja.currentDocument._document.getElementById(value) !== null) {
-                    alert("The following ID: " + value + " is already in Use");
-                }
-
-            }
-
             el.setAttribute(att, value);
         }
     },
diff --git a/js/panels/properties.reel/properties.html b/js/panels/properties.reel/properties.html
index 72a6def6..bcf54b95 100755
--- a/js/panels/properties.reel/properties.html
+++ b/js/panels/properties.reel/properties.html
@@ -10,35 +10,19 @@
         <link rel="stylesheet" href="properties.css" type="text/css">
         <script type="text/montage-serialization">
         {
-            "elementNameInput1": {
-                "module": "montage/ui/textfield.reel",
-                "name": "Textfield",
+            "elementName": {
+                "prototype": "montage/ui/textfield.reel",
                 "properties": {
                     "element": {"#": "elementName"},
                     "readOnly": true
-                },
-                "bindings": {
-                    "value": {
-                        "boundObject": {"@": "owner"},
-                        "boundObjectPropertyPath": "elementName",
-                        "oneway": true
-                    }
                 }
             },
 
-            "elementID": {
-                "module": "montage/ui/textfield.reel",
-                "name": "Textfield",
+            "elementId": {
+                "prototype": "montage/ui/textfield.reel",
                 "properties": {
-                    "element": {"#": "elementID"},
+                    "element": {"#": "elementId"},
                     "readOnly": false
-                },
-                "bindings": {
-                    "value": {
-                        "boundObject": {"@": "owner"},
-                        "boundObjectPropertyPath": "elementID",
-                        "oneway": true
-                    }
                 }
             },
 
@@ -46,35 +30,11 @@
                 "module": "montage/ui/textfield.reel",
                 "name": "Textfield",
                 "properties": {
-                    "element": {"#": "elementClassName"},
+                    "element": {"#": "elementClass"},
                     "readOnly": false
-                },
-                "bindings": {
-                    "value": {
-                        "boundObject": {"@": "owner"},
-                        "boundObjectPropertyPath": "elementClassName",
-                        "oneway": true
-                    }
-                }
-            },
-
-            "elementNameAttribute": {
-                "module": "montage/ui/textfield.reel",
-                "name": "Textfield",
-                "properties": {
-                    "element": {"#": "elementNameAttribute"},
-                    "readOnly": false
-                },
-                "bindings": {
-                    "value": {
-                        "boundObject": {"@": "owner"},
-                        "boundObjectPropertyPath": "nameAttribute",
-                        "oneway": false
-                    }
                 }
             },
 
-
             "PosSizeSection": {
                 "module": "js/panels/properties.reel/section.reel",
                 "name": "Section",
@@ -142,9 +102,9 @@
                 "name": "Properties",
                 "properties": {
                     "element":              {"#": "propertiesPanel"},
-                    "elementNameInput":     {"@": "elementNameInput1"},
-                    "elementId":            {"@": "elementID"},
-                    "elementNameAttribute": {"@": "elementNameAttribute"},
+                    "elementName":          {"@": "elementName"},
+                    "elementClass":         {"@": "elementClass"},
+                    "elementId":            {"@": "elementId"},
                     "positionSize":         {"@": "PosSize"},
                     "threeD":               {"@": "threeDProperties"}
                 }
@@ -156,21 +116,17 @@
     <section id="propertiesPanel" class="propertiesPanel">
         <section class="sectional">
             <section class="fieldCol">
-                <label id="lblElement">Element:</label>
+                <label>Element:</label>
                 <article class="fieldRow"><input type="text" id="elementName" class="nj-skinned" readonly="readonly"></article>
             </section>
             <section class="fieldCol">
-                <label id="lblID">ID:</label>
-                <article class="fieldRow"><input type="text" id="elementID" class="nj-skinned" /></article>
+                <label>ID:</label>
+                <article class="fieldRow"><input type="text" id="elementId" class="nj-skinned" /></article>
             </section>
             <section class="fieldCol">
-                <label id="lblClass">Class:</label>
+                <label>Class:</label>
                 <article class="fieldRow"><input type="text" id="elementClassName" class="nj-skinned" /></article>
             </section>
-            <section class="fieldCol">
-                <label id="lblName">Name:</label>
-                <article class="fieldRow"><input type="text" id="elementNameAttribute" class="nj-skinned" /></article>
-            </section>
         </section>
         <section id="PosSize"></section>
         <section id="customSections">
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index 947d7937..f35bf2e0 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -17,15 +17,11 @@ exports.Properties = Montage.create(Component, {
         value: null
     },
 
-    elementID: {
+    elementId: {
         value: null
     },
 
-    elementClassName: {
-        value: null
-    },
-
-    nameAttribute: {
+    elementClass: {
         value: null
     },
 
@@ -60,6 +56,14 @@ exports.Properties = Montage.create(Component, {
 
             this.eventManager.addEventListener("openDocument", this, false);
             this.eventManager.addEventListener("switchDocument", this, false);
+
+            this.elementId.element.addEventListener("blur", this, false);
+            this.elementId.element.addEventListener("focus", this, false);
+            this.elementId.element.addEventListener("keyup", this, false);
+
+            this.elementClass.element.addEventListener("blur", this, false);
+            this.elementClass.element.addEventListener("focus", this, false);
+            this.elementClass.element.addEventListener("keyup", this, false);
         }
     },
 
@@ -73,12 +77,6 @@ exports.Properties = Montage.create(Component, {
             if(this.application.ninja.selectedElements.length === 0) {
                 this.displayStageProperties();
             }
-
-            this.elementId.element.addEventListener("blur", this, false);
-            this.elementId.element.addEventListener("keyup", this, false);
-
-            this.elementNameAttribute.element.addEventListener("blur", this, false);
-            this.elementNameAttribute.element.addEventListener("keyup", this, false);
         }
     },
 
@@ -87,7 +85,7 @@ exports.Properties = Montage.create(Component, {
             // For now always assume that the stage is selected by default
             if(this.application.ninja.selectedElements.length === 0) {
                 this.displayStageProperties();
-            }else {
+            } else {
                 if(this.application.ninja.selectedElements.length === 1) {
                     this.displayElementProperties(this.application.ninja.selectedElements[0]._element);
                 } else {
@@ -102,17 +100,29 @@ exports.Properties = Montage.create(Component, {
      */
     handleBlur: {
         value: function(event) {
-            console.log(event.target);
-            if(event.target.id === "elementID") {
+
+            if(event.target.id === "elementId") {
+
+                // Remove all white spaces from the id
+                this.elementId.value = this.elementId.value.replace(/\s/g, '');
+
+                // Check if that id is in use
+                if(this.application.ninja.currentDocument._document.getElementById(this.elementId.value) !== null) {
+                    // TODO: Replace with Ninja Alert
+                    alert("The following ID: " + this.elementId.value + " is already in use");
+                }
+
                 if(this.application.ninja.selectedElements.length) {
                     ElementsMediator.setAttribute(this.application.ninja.selectedElements[0], "id", this.elementId.value, "Change", "pi");
                 } else {
                     ElementsMediator.setAttribute(this.application.ninja.currentDocument.documentRoot, "id", this.elementId.value, "Change", "pi", this.application.ninja.currentDocument.documentRoot.elementModel.id);
                 }
-            } else if(event.target.id === "elementNameAttribute") {
+            } else if(event.target.id === "elementClass") {
                 if(this.application.ninja.selectedElements.length) {
-                    //ElementsMediator.setAttribute(this.application.ninja.selectedElements[0], "name", this.elementNameAttribute.value, "Change", "pi");
-                    this.application.ninja.selectedElements[0]._element.setAttribute("name", this.elementNameAttribute.value);
+                    ElementsMediator.setAttribute(this.application.ninja.selectedElements[0], "class", this.elementClass.value, "Change", "pi");
+                    console.log(this.application.ninja.selectedElements[0]._element.className);
+                } else {
+                    ElementsMediator.setAttribute(this.application.ninja.currentDocument.documentRoot, "class", this.elementClass.value, "Change", "pi", this.application.ninja.currentDocument.documentRoot.elementModel.elementClass);
                 }
             }
         }
@@ -121,11 +131,7 @@ exports.Properties = Montage.create(Component, {
     handleKeyup: {
         value: function(event) {
             if(event.keyCode === 13) {
-                if(event.target === "elementID") {
-                    this.elementId.element.blur();
-                } else if(event.target === "elementNameAttribute") {
-                    this.elementNameAttribute.element.blur();
-                }
+                event.target.blur();
             }      
         }
     },
@@ -180,10 +186,9 @@ exports.Properties = Montage.create(Component, {
         value: function() {
             var stage = this.application.ninja.currentDocument.documentRoot;
             //this is test code please remove
-            this.elementName = "Stage";
+            this.elementName.value = "Stage";
             this.elementId.value = stage.elementModel.id;
-            this.elementClassName = "";
-            this.nameAttribute = "";
+            this.elementClass.value = "";
 
             this.positionSize.disablePosition = true;
             this.threeD.disableTranslation = true;
@@ -243,10 +248,9 @@ exports.Properties = Montage.create(Component, {
             var customPI,
                 currentValue;
 
-            this.elementName = el.elementModel.selection;
+            this.elementName.value = el.elementModel.selection;
             this.elementId.value = el.getAttribute("id") || "";
-            this.elementClassName = el.getAttribute("class");
-            this.nameAttribute = el.getAttribute("name") || "";
+            this.elementClass.value = el.getAttribute("class");
 
             this.positionSize.disablePosition = false;
             this.threeD.disableTranslation = false;
@@ -358,7 +362,7 @@ exports.Properties = Montage.create(Component, {
 
     displayGroupProperties: {
         value: function (els) {
-            this.elementName = "Multiple Elements";
+            this.elementName.value = "Multiple Elements";
         }
     },
 
-- 
cgit v1.2.3


From 57d4a82977a1f0e809511fe894886f88581d9615 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Wed, 14 Mar 2012 16:22:22 -0700
Subject: Corrections for Uber shader IO

---
 js/document/html-document.js           |  2 ++
 js/lib/rdge/materials/uber-material.js | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'js')

diff --git a/js/document/html-document.js b/js/document/html-document.js
index f4ec3184..d4db6e2f 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -218,6 +218,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
 					cdm.loadGLData(elt,  value,  null );
 					*/
 
+					// /*
 					var importStr = value[i];
 					var startIndex = importStr.indexOf( "id: " );
 					if (startIndex >= 0) {
@@ -244,6 +245,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
 							}
 						}
 					}
+					// */
 				}
 			}
 		}
diff --git a/js/lib/rdge/materials/uber-material.js b/js/lib/rdge/materials/uber-material.js
index 8ec5b05c..91f43754 100755
--- a/js/lib/rdge/materials/uber-material.js
+++ b/js/lib/rdge/materials/uber-material.js
@@ -477,7 +477,7 @@ var UberMaterial = function UberMaterial() {
 		if(environmentMap)
 		{
 			this.setProperty( "environmentMap", environmentMap );
-			this.setProperty( "environmentAmount", Number( pu.nextValue( "envReflection" ) ) );
+			this.setProperty( "environmentAmount", Number( pu.nextValue( "environmentAmount" ) ) );
 		}
 
 		this.rebuildShader();
@@ -495,10 +495,10 @@ var UberMaterial = function UberMaterial() {
 		if (typeof caps.material != 'undefined')
 		{
 			exportStr += "materialProps: true\n";
-			exportStr += "ambientColor: " + caps.material.ambientColor + "\n";
-			exportStr += "diffuseColor: " + caps.material.diffuseColor + "\n";
-			exportStr += "specularColor: " + caps.material.specularColor + "\n";
-			exportStr += "specularPower: " + caps.material.specularPower + "\n";
+			exportStr += "ambientColor: " + this._ambientColor + "\n";
+			exportStr += "diffuseColor: " + this._diffuseColor + "\n";
+			exportStr += "specularColor: " + this._specularColor + "\n";
+			exportStr += "specularPower: " + this._specularPower + "\n";
 		}
 
 		if (typeof caps.lighting != 'undefined')
@@ -559,7 +559,7 @@ var UberMaterial = function UberMaterial() {
 		if(typeof caps.environmentMap != 'undefined')
 		{
 			exportStr += "environmentMap: " + caps.environmentMap.texture + "\n";
-			exportStr += "envReflection: " + caps.environmentMap.envReflection + "\n";
+			exportStr += "environmentAmount: " + caps.environmentMap.envReflection + "\n";
 		}
 		
 		// every material needs to terminate like this
-- 
cgit v1.2.3


From a7cb2c0b22f03b79f19d4a9a2eb691d1ccc392f9 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Wed, 14 Mar 2012 18:04:11 -0700
Subject: adding a focus manager to handle panel bugs where blur was not
 getting called when clicking on the canvas.

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/components/focus-manager.reel/focus-manager.js | 49 +++++++++++++++++++++++
 js/ninja.reel/ninja.css                           |  4 ++
 js/ninja.reel/ninja.html                          | 11 ++++-
 js/panels/properties.reel/properties.html         |  2 +-
 js/stage/stage.reel/stage.html                    |  7 +++-
 js/stage/stage.reel/stage.js                      |  4 ++
 6 files changed, 74 insertions(+), 3 deletions(-)
 create mode 100644 js/components/focus-manager.reel/focus-manager.js

(limited to 'js')

diff --git a/js/components/focus-manager.reel/focus-manager.js b/js/components/focus-manager.reel/focus-manager.js
new file mode 100644
index 00000000..65a84bc1
--- /dev/null
+++ b/js/components/focus-manager.reel/focus-manager.js
@@ -0,0 +1,49 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+
+var Montage = require("montage/core/core").Montage,
+    Component = require("montage/ui/component").Component;
+
+exports.FocusManager = Montage.create(Component, {
+
+    hasTemplate: {
+        value: false
+    },
+
+    element: {
+        serializable: true,
+        enumerable: true,
+        get: function() {
+            return this._element;
+        },
+        set: function(value) {
+            // call super set
+            Object.getPropertyDescriptor(Component, "element").set.call(this, value);
+        }
+    },
+
+    hiddenInput: {
+        value: null
+    },
+
+    prepareForDraw: {
+        value: function() {
+            this.hiddenInput = document.createElement("input");
+            this.hiddenInput.type = "text";
+
+            this.element.appendChild(this.hiddenInput);
+
+        }
+    },
+
+    setFocus: {
+        value: function() {
+            this.hiddenInput.focus();
+        }
+    }
+
+});
+
diff --git a/js/ninja.reel/ninja.css b/js/ninja.reel/ninja.css
index 83c0e569..61251eff 100755
--- a/js/ninja.reel/ninja.css
+++ b/js/ninja.reel/ninja.css
@@ -7,3 +7,7 @@
 .main {
     padding: 100px;
 }
+
+.hidden {
+    display: none;
+}
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 3dc45498..f9e1efdd 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -287,6 +287,13 @@
                 "name": "MainMenuController"
             },
 
+            "focusManager": {
+                "object": "js/components/focus-manager.reel",
+                "properties": {
+                    "element": {"#": "focus-container" }
+                }
+            },
+
             "owner": {
                 "module": "js/ninja.reel",
                 "name": "Ninja",
@@ -396,7 +403,9 @@
 
             <section data-montage-id="bottomSplitter" class="bottomSplitter splitter"></section>
         </section>
-        
+
+        <div data-montage-id="focus-container" class="hidden"></div>
+
         <section id="popupWindows"></section>
 
     </div>
diff --git a/js/panels/properties.reel/properties.html b/js/panels/properties.reel/properties.html
index bcf54b95..d212ae80 100755
--- a/js/panels/properties.reel/properties.html
+++ b/js/panels/properties.reel/properties.html
@@ -125,7 +125,7 @@
             </section>
             <section class="fieldCol">
                 <label>Class:</label>
-                <article class="fieldRow"><input type="text" id="elementClassName" class="nj-skinned" /></article>
+                <article class="fieldRow"><input type="text" id="elementClass" class="nj-skinned" /></article>
             </section>
         </section>
         <section id="PosSize"></section>
diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html
index 812e3d55..f796303c 100755
--- a/js/stage/stage.reel/stage.html
+++ b/js/stage/stage.reel/stage.html
@@ -50,6 +50,10 @@
                     "element" : {"#": "textToolObject"}
                 }
             },
+
+            "focusManager": {
+                "object": "js/components/focus-manager.reel"
+            },
             
             "owner": {
                 "module": "js/stage/stage.reel",
@@ -63,7 +67,8 @@
                     "stageDeps": {"@": "StageDeps1"},
                     "layout":   {"@": "layout1"},
 					"stageView": {"@": "stageView"},
-                    "textTool": {"@": "textTool"}
+                    "textTool": {"@": "textTool"},
+                    "focusManager": {"@": "focusManager"}
                 },
                 "bindings": {
                     "currentDocumentStageView": {
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 4c1d046b..a624b2c6 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -319,6 +319,10 @@ exports.Stage = Montage.create(Component, {
 
     handleMousedown: {
         value: function(event) {
+            // Call the focus manager to set focus to blur any focus'd elements
+            this.focusManager.setFocus();
+
+
             var point;
 //            event.preventDefault();   // commenting because HTML elements in the IDE are retaining focus
             // If right click set the context menu to true to prevent a mouse up.
-- 
cgit v1.2.3


From da5dfc8863ad47c48414ff1fdacbacdb91abd30c Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Wed, 14 Mar 2012 23:25:34 -0700
Subject: Fixing the splitter resize canvas bug by getting the size when a
 document is opened.

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/panels/Splitter.js        | 6 ------
 js/stage/stage.reel/stage.js | 7 +++++--
 2 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'js')

diff --git a/js/panels/Splitter.js b/js/panels/Splitter.js
index a396ea28..e92cb2dd 100755
--- a/js/panels/Splitter.js
+++ b/js/panels/Splitter.js
@@ -91,12 +91,6 @@ exports.Splitter = Montage.create(Component, {
         }
     },
 
-    didDraw: {
-        value: function() {
-            this.application.ninja.stage.resizeCanvases = true;
-        }
-    },
-
     handleClick : {
         value: function() {
             if (!this.disabled) {
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index a624b2c6..e139af97 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -170,8 +170,7 @@ exports.Stage = Montage.create(Component, {
 
                 // Hack for now until a full component
                 this.layout.draw();
-            }
-            else if(this.updatedStage) {
+            } else if(this.updatedStage) {
                 this.layout.draw();
                 this.layout.draw3DInfo(true);
             }
@@ -235,6 +234,10 @@ exports.Stage = Montage.create(Component, {
 
             this.hideCanvas(false);
 
+            // Recalculate the canvas sizes because of splitter resizing
+            this._canvas.width = this._layoutCanvas.width = this._drawingCanvas.width = this.element.offsetWidth - 11 ;
+            this._canvas.height = this._layoutCanvas.height = this._drawingCanvas.height = this.element.offsetHeight - 11;
+
             this._documentRoot = this.application.ninja.currentDocument.documentRoot;
             this._viewport = this.application.ninja.currentDocument.documentRoot.parentNode;
 
-- 
cgit v1.2.3


From 7a9e7ff2e113c95aada64cfccbc140fa77599d57 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Thu, 15 Mar 2012 01:08:14 -0700
Subject: Adding Temp drag-drop I/O support

Added methods to get data from dropped file while document is opened and save as a file. Currently only supporting images and SVGs, no error handling, which will have to be done.
---
 js/mediators/drag-drop-mediator.js | 188 ++++++++++++++-----------------------
 1 file changed, 73 insertions(+), 115 deletions(-)

(limited to 'js')

diff --git a/js/mediators/drag-drop-mediator.js b/js/mediators/drag-drop-mediator.js
index bf22aed2..cc384704 100755
--- a/js/mediators/drag-drop-mediator.js
+++ b/js/mediators/drag-drop-mediator.js
@@ -13,17 +13,7 @@ exports.DragDropMediator = Montage.create(Component, {
         value: null,
         writable: true
     },
-
-    baseX: {
-        value: null,
-        writable: true
-    },
-
-    baseY: {
-        value: null,
-        writable: true
-    },
-
+    
     dropDelegate: {
         value: null
     },
@@ -65,110 +55,78 @@ exports.DragDropMediator = Montage.create(Component, {
     },
 
     handleDropEvent: {
-        value: function(evt){
-            var xferString, component, file, files, idx, len;
-
-            this.baseX = evt.offsetX - this.application.ninja.stage.userContentLeft;
-            this.baseY = evt.offsetY - this.application.ninja.stage.userContentTop;
-
-            xferString = evt.dataTransfer.getData("text/plain");
-            if(xferString) {
-                // If the drop is a component, call the delegate with the top,left coordinates
-                if(xferString.indexOf("componentDrop") > -1) {
-                    if(this.dropDelegate && typeof this.dropDelegate === 'object') {
-                        this.dropDelegate.handleComponentDrop(this.baseX, this.baseY);
-                        return;
-                    }
-                }
-
-            }
-
-            // Verify that browser supports FileReader API.
-            if (typeof(window.FileReader) === "undefined") {
-                alert("File API and FileReader APIs are not supported.");
-                // Exit function since there isn't anything else we can do.
-                return;
-            }
-
-            files = evt.dataTransfer.files;
-            len = files.length;
-
-            // Loop over all dragged files...
-            for (idx = 0; idx < len; idx++) {
-                file = files[idx];
-                // Only do anything if the current file is an image (or has an image mime-type.
-                if (file.type.match("^image/")) {
-                    var reader = new FileReader();
-                    // Create a LoadHandler to access each outer file var
-                    reader.onload = this.createLoadHandler(file, this.baseX, this.baseY);
-
-                    if(file.type.match("^image/svg\\+xml")) {// this is SVG
-                        reader.readAsText(file);
-                    } else{
-                        reader.readAsDataURL(file);
-                    }
-                    
-                }
-            }
-
-            return false;
-        }
-    },
-
-    createLoadHandler: {
-        value: function(file, baseX, baseY) {
-            return function(evt2) {
-                var domElem = null;
-
-                if(file.type.match("^image/svg\\+xml")){ // this is an SVG file
-                    var tempElem = document.createElement("div");
-                    tempElem.innerHTML = evt2.currentTarget.result;
-                    domElem = tempElem.children[0];
-
-                    NJUtils.makeElementModel(domElem, "SVG", "block");
-                } else { // treat as a regular image
-                    domElem = NJUtils.makeNJElement("image", "image", "image");
-                    domElem.src = evt2.currentTarget.result;
-                }
-
-
-                // Not sure we need an ID for the image
-                                /*
-                // Use the Image filename if valid for the id
-                var filename = file.fileName.substr(0, file.fileName.lastIndexOf('.')) || file.fileName;
-                filename = filename.replace(/ /g,"_");
-
-
-                if(this.isValidFilename(filename)) {
-                    //domElem.id = filename;
-                } else {
-                    //domElem.id = DocumentControllerModule.DocumentController.CreateElementID(img.tagName);
-                }
-                */
-
-                var rules = {
-                    'position': 'absolute',
-                    'top' : baseY + 'px',
-                    'left' : baseX + 'px',
-                    '-webkit-transform-style' : 'preserve-3d',
-                    '-webkit-transform' : 'perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1)'
-                };
-
-                NJevent("elementAdding", {el: domElem, data:rules});
-            };
-        }
-    },
-
-    isValidFilename: {
-        value: function(id){
-            if(id && id !== "") {
-                var regexID = /^([a-zA-Z])+([a-zA-Z0-9_\.\:\-])+/;
-                return(regexID.test(id))
-            } else {
-                return false;
-            }
+        value: function(e){
+        	//
+        	var i, files = e.dataTransfer.files, position = {x: e.offsetX, y: e.offsetY},
+        		rootUrl = this.application.ninja.coreIoApi.rootUrl+escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1])),
+        		rootUri = this.application.ninja.documentController.documentHackReference.root;
+        	//
+        	for (i=0; files[i]; i++) {
+        		if (files[i].type.indexOf('image') !== -1) {
+        			var reader = new FileReader(), file = reader.readAsArrayBuffer(files[i]);
+        			reader.fileName = files[i].name, reader.fileType = files[i].type, reader.rootUrl = rootUrl, reader.rootUri = rootUri, reader.filePosition = position;
+        			reader.onload = function (e) {
+        				//
+        				var url, uri, dir, save, counter, tempName, element, rules, fileName;
+        				if (this.application.ninja.coreIoApi.directoryExists({uri: e.currentTarget.rootUri+'images'}).status === 204) {
+        					uri = e.currentTarget.rootUri+'images';
+        					url = e.currentTarget.rootUrl+'images';
+        				} else if (this.application.ninja.coreIoApi.directoryExists({uri: e.currentTarget.rootUri+'img'}).status === 204) {
+        					uri = e.currentTarget.rootUri+'img';
+        					url = e.currentTarget.rootUrl+'img';
+        				} else {
+        					dir = this.application.ninja.coreIoApi.createDirectory({uri: e.currentTarget.rootUri+'images'});
+        					if (dir.success && dir.status === 201) {
+        						uri = e.currentTarget.rootUri+'images';
+        						url = e.currentTarget.rootUrl+'images';
+        					} else {
+        						//TODO: HANDLE ERROR ON CREATING FOLDER
+        					}
+        				}
+        				//
+        				if (this.application.ninja.coreIoApi.fileExists({uri: uri+'/'+e.currentTarget.fileName}).status === 404) {
+        					save = this.application.ninja.coreIoApi.createFile({uri: uri+'/'+e.currentTarget.fileName, contents: e.currentTarget.result, contentType: e.currentTarget.fileType});
+        					fileName = e.currentTarget.fileName;
+        				} else {
+        					counter = 1;
+        					tempName = e.currentTarget.fileName.split('.'+(e.currentTarget.fileName.split('.')[e.currentTarget.fileName.split('.').length-1]))[0];
+        					tempName += '_'+counter+'.'+(e.currentTarget.fileName.split('.')[e.currentTarget.fileName.split('.').length-1]);
+        					while (this.application.ninja.coreIoApi.fileExists({uri: uri+'/'+tempName}).status !== 404) {
+        						counter++;
+        						tempName = e.currentTarget.fileName.split('.'+(e.currentTarget.fileName.split('.')[e.currentTarget.fileName.split('.').length-1]))[0];
+        						tempName += '_'+counter+'.'+(e.currentTarget.fileName.split('.')[e.currentTarget.fileName.split('.').length-1]);
+        					}
+        					save = this.application.ninja.coreIoApi.createFile({uri: uri+'/'+tempName, contents: e.currentTarget.result, contentType: e.currentTarget.fileType});
+        					fileName = tempName;
+        				}
+        				if (save && save.success && save.status === 201) {
+        					//
+        					if (e.currentTarget.fileType.indexOf('svg') !== -1) {
+        						element = NJUtils.makeNJElement('embed', 'SVG', 'block');//TODO: Verify this is proper
+                    			element.src = url+'/'+fileName;
+                    			element.type = 'image/svg+xml';
+        					} else {
+        						element = NJUtils.makeNJElement('image', 'image', 'image');
+                    			element.src = url+'/'+fileName;
+        					}
+        					//
+        					rules = {
+                    					'position': 'absolute',
+                    					'top' : e.currentTarget.filePosition.y + 'px',
+                    					'left' : e.currentTarget.filePosition.x + 'px'
+                					};
+                			//
+        					NJevent("elementAdding", {el: element, data: rules});
+        				} else {
+        					//TODO: HANDLE ERROR ON SAVING FILE TO BE ADDED AS ELEMENT
+        				}
+        			}.bind(this);
+        		} else {
+        			//TODO: NOT AN IMAGE, HANDLE SPECIAL CASE
+        		}
+        	}
+        	//Not sure why return value should be, seemed as false to work
+        	return false;
         }
     }
-
-
 });
-- 
cgit v1.2.3


From 57ad8ea9c96005a4199cd75c82f4c7db0361e7b9 Mon Sep 17 00:00:00 2001
From: Armen Kesablyan
Date: Thu, 15 Mar 2012 15:20:00 -0700
Subject: Presets Panel: Added Scale Up and Down to transitions list. According
 to eric G.

Signed-off-by: Armen Kesablyan <armen@motorola.com>
---
 js/panels/presets/default-transition-presets.js | 30 +++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

(limited to 'js')

diff --git a/js/panels/presets/default-transition-presets.js b/js/panels/presets/default-transition-presets.js
index 00873231..271ad821 100644
--- a/js/panels/presets/default-transition-presets.js
+++ b/js/panels/presets/default-transition-presets.js
@@ -88,6 +88,36 @@ exports.transitionPresets = {
                         "-webkit-transform": "rotate(180deg)"
                     }
                 }]
+            },
+            {
+                "text": "Scale Up",
+                "selectorBase" : "scale-up",
+                "rules" : [{
+                    "selectorSuffix" : "",
+                    "styles" : {
+                        "-webkit-transition": "-webkit-transform 0.4s ease-in"
+                    }
+                }, {
+                    "selectorSuffix" : ":hover",
+                    "styles" : {
+                        "-webkit-transform": "scale(1.4)"
+                    }
+                }]
+            },
+            {
+                "text": "Scale Down",
+                "selectorBase" : "scale-down",
+                "rules" : [{
+                    "selectorSuffix" : "",
+                    "styles" : {
+                        "-webkit-transition": "-webkit-transform 0.4s ease-in"
+                    }
+                }, {
+                    "selectorSuffix" : ":hover",
+                    "styles" : {
+                        "-webkit-transform": "scale(.5)"
+                    }
+                }]
             }]
     }]
 };
\ No newline at end of file
-- 
cgit v1.2.3


From eda07f5122cc552737fa6f647ef7f6721c4001b8 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Thu, 15 Mar 2012 20:16:25 -0700
Subject: Fixing offset bug for drag-and-drop

---
 js/mediators/drag-drop-mediator.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'js')

diff --git a/js/mediators/drag-drop-mediator.js b/js/mediators/drag-drop-mediator.js
index cc384704..c8e781a6 100755
--- a/js/mediators/drag-drop-mediator.js
+++ b/js/mediators/drag-drop-mediator.js
@@ -112,8 +112,8 @@ exports.DragDropMediator = Montage.create(Component, {
         					//
         					rules = {
                     					'position': 'absolute',
-                    					'top' : e.currentTarget.filePosition.y + 'px',
-                    					'left' : e.currentTarget.filePosition.x + 'px'
+                    					'top' : (parseInt(e.currentTarget.filePosition.y) - parseInt(this.application.ninja.stage.userContentTop)) + 'px',
+                    					'left' : (parseInt(e.currentTarget.filePosition.x) - parseInt(this.application.ninja.stage.userContentLeft)) + 'px'
                 					};
                 			//
         					NJevent("elementAdding", {el: element, data: rules});
-- 
cgit v1.2.3


From a295375178659345e03517f7eb20c22364f4ca4a Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Thu, 15 Mar 2012 21:06:40 -0700
Subject: Temp fix for element dimensions (SVG)

Added a temp fix to allow for a redraw of an SVG on load.
---
 js/mediators/drag-drop-mediator.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'js')

diff --git a/js/mediators/drag-drop-mediator.js b/js/mediators/drag-drop-mediator.js
index c8e781a6..9d5dd256 100755
--- a/js/mediators/drag-drop-mediator.js
+++ b/js/mediators/drag-drop-mediator.js
@@ -105,6 +105,10 @@ exports.DragDropMediator = Montage.create(Component, {
         						element = NJUtils.makeNJElement('embed', 'SVG', 'block');//TODO: Verify this is proper
                     			element.src = url+'/'+fileName;
                     			element.type = 'image/svg+xml';
+                    			//TODO: Remove temp fix for SVG redraw on drop
+	        					element.onload = function () {
+        							NJevent("elementAdding", {el: element, data: rules});
+        						}
         					} else {
         						element = NJUtils.makeNJElement('image', 'image', 'image');
                     			element.src = url+'/'+fileName;
@@ -114,9 +118,9 @@ exports.DragDropMediator = Montage.create(Component, {
                     					'position': 'absolute',
                     					'top' : (parseInt(e.currentTarget.filePosition.y) - parseInt(this.application.ninja.stage.userContentTop)) + 'px',
                     					'left' : (parseInt(e.currentTarget.filePosition.x) - parseInt(this.application.ninja.stage.userContentLeft)) + 'px'
-                					};
-                			//
-        					NJevent("elementAdding", {el: element, data: rules});
+                			};
+        					//
+                    		NJevent("elementAdding", {el: element, data: rules});
         				} else {
         					//TODO: HANDLE ERROR ON SAVING FILE TO BE ADDED AS ELEMENT
         				}
-- 
cgit v1.2.3


From c9b03565de5e60b50d0e5f80e40169be1efe339e Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Thu, 15 Mar 2012 21:11:49 -0700
Subject: Temp fix applied to all elements

This should be moved to 'makeNJElement' to account for the element to be loaded.
---
 js/mediators/drag-drop-mediator.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'js')

diff --git a/js/mediators/drag-drop-mediator.js b/js/mediators/drag-drop-mediator.js
index 9d5dd256..5fe61167 100755
--- a/js/mediators/drag-drop-mediator.js
+++ b/js/mediators/drag-drop-mediator.js
@@ -105,14 +105,14 @@ exports.DragDropMediator = Montage.create(Component, {
         						element = NJUtils.makeNJElement('embed', 'SVG', 'block');//TODO: Verify this is proper
                     			element.src = url+'/'+fileName;
                     			element.type = 'image/svg+xml';
-                    			//TODO: Remove temp fix for SVG redraw on drop
-	        					element.onload = function () {
-        							NJevent("elementAdding", {el: element, data: rules});
-        						}
         					} else {
         						element = NJUtils.makeNJElement('image', 'image', 'image');
                     			element.src = url+'/'+fileName;
         					}
+        					//TODO: Remove temp fix for elements to redraw on drop
+	        				element.onload = function () {
+        						NJevent("elementAdding", {el: element, data: rules});
+        					}
         					//
         					rules = {
                     					'position': 'absolute',
-- 
cgit v1.2.3


From 8b6dc6097fbd974df5363a72756de649794363b6 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Fri, 16 Mar 2012 10:35:33 -0700
Subject: fixing the drag and drop images to the pasteboard

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/mediators/drag-drop-mediator.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/mediators/drag-drop-mediator.js b/js/mediators/drag-drop-mediator.js
index 5fe61167..3a965be5 100755
--- a/js/mediators/drag-drop-mediator.js
+++ b/js/mediators/drag-drop-mediator.js
@@ -117,7 +117,9 @@ exports.DragDropMediator = Montage.create(Component, {
         					rules = {
                     					'position': 'absolute',
                     					'top' : (parseInt(e.currentTarget.filePosition.y) - parseInt(this.application.ninja.stage.userContentTop)) + 'px',
-                    					'left' : (parseInt(e.currentTarget.filePosition.x) - parseInt(this.application.ninja.stage.userContentLeft)) + 'px'
+                    					'left' : (parseInt(e.currentTarget.filePosition.x) - parseInt(this.application.ninja.stage.userContentLeft)) + 'px',
+                                        '-webkit-transform-style' : 'preserve-3d',
+                                        '-webkit-transform' : 'perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1)'
                 			};
         					//
                     		NJevent("elementAdding", {el: element, data: rules});
-- 
cgit v1.2.3


From c0a95991ba13deee9110ac0c1e443983834cfd63 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Fri, 16 Mar 2012 10:42:24 -0700
Subject: IKNINJA-1305 : fixed the check for stopVideos() method's existence

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/controllers/document-controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 87e93465..7d982a62 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -372,7 +372,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
                     nextDocumentIndex = closeDocumentIndex - 1;
                 }
                 this.application.ninja.stage.stageView.switchDocument(this._documents[nextDocumentIndex]);
-                if(typeof this.activeDocument.stopVideos !== "undefined"){doc.stopVideos();}
+                if(typeof doc.stopVideos !== "undefined"){doc.stopVideos();}
                 this._removeDocumentView(doc.container);
             }else if(this._documents.length === 0){
                 if(typeof this.activeDocument.pauseAndStopVideos !== "undefined"){
-- 
cgit v1.2.3


From d1243d98d2f517055437cc67e963528771aa4c4b Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Fri, 16 Mar 2012 15:41:26 -0700
Subject: fixing the components drag and drop.

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/mediators/drag-drop-mediator.js                            | 11 +++++++++++
 .../ComponentsPanelBase.reel/ComponentsPanelBase.js           |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/mediators/drag-drop-mediator.js b/js/mediators/drag-drop-mediator.js
index 3a965be5..8663b06e 100755
--- a/js/mediators/drag-drop-mediator.js
+++ b/js/mediators/drag-drop-mediator.js
@@ -60,6 +60,17 @@ exports.DragDropMediator = Montage.create(Component, {
         	var i, files = e.dataTransfer.files, position = {x: e.offsetX, y: e.offsetY},
         		rootUrl = this.application.ninja.coreIoApi.rootUrl+escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1])),
         		rootUri = this.application.ninja.documentController.documentHackReference.root;
+
+            var xferString = e.dataTransfer.getData("text/plain");
+            if(xferString) {
+                // If the drop is a component, call the delegate with the top,left coordinates
+                if(xferString.indexOf("componentDrop") > -1) {
+                    if(this.dropDelegate && typeof this.dropDelegate === 'object') {
+                        this.dropDelegate.handleComponentDrop(e.offsetX - this.application.ninja.stage.userContentLeft, e.offsetY - this.application.ninja.stage.userContentTop);
+                        return;
+                    }
+                }
+            }
         	//
         	for (i=0; files[i]; i++) {
         		if (files[i].type.indexOf('image') !== -1) {
diff --git a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
index b6bee37d..b4eec771 100755
--- a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
+++ b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
@@ -118,7 +118,7 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component
     didCreate: {
         value: function() {
             // Setup the drop delegate
-//            this.application.ninja.dragDropMediator.dropDelegate = this;
+            this.application.ninja.dragDropMediator.dropDelegate = this;
             // Loop through the component and load the JSON data for them
             this._loadComponents();
         }
-- 
cgit v1.2.3


From 4bec28fbd8371deceffd1563190cb5e399d554d3 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Fri, 16 Mar 2012 16:36:04 -0700
Subject: Squashed commit of SnapManagerFixes

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/stage/stage.reel/stage.js      |  30 +++++++++++
 js/tools/SelectionTool.js         |   5 +-
 js/tools/Translate3DToolBase.js   | 111 ++++++++++++++++++++++++++++----------
 js/tools/TranslateObject3DTool.js |  40 +++++++++++---
 js/tools/drawing-tool.js          |   2 +
 js/tools/modifier-tool-base.js    |  25 ++++-----
 6 files changed, 159 insertions(+), 54 deletions(-)

(limited to 'js')

diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index e139af97..00b72490 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -518,6 +518,36 @@ exports.Stage = Montage.create(Component, {
         }
     },
 
+    /**
+     * GetSelectableElement: Returns a selectable object (direct child of current container) at clicked point
+     *
+     * @param: X,Y
+     * @return: Returns the current container if the the X,Y hits an element in the exclusion list
+     */
+    GetSelectableElement: {
+        value: function(pos) {
+            var item = this.GetElement(pos);
+            if(this.application.ninja.currentDocument.inExclusion(item) !== -1) {
+                return this.application.ninja.currentSelectedContainer;
+            }
+            var activeContainerId = this.application.ninja.currentSelectedContainer.uuid;
+            if(item.parentNode.uuid === activeContainerId) {
+                return item;
+            } else {
+                var outerElement = item.parentNode;
+
+                while(outerElement.parentNode && outerElement.parentNode.uuid !== activeContainerId) {
+                    // If element is higher up than current container then return
+                    if(outerElement.id === "UserContent") return;
+                    // else keep going up the chain
+                    outerElement = outerElement.parentNode;
+                }
+
+                return outerElement;
+            }
+        }
+    },
+
     /**
      * GetElement: Returns the object under the X,Y coordinates passed as an obj with x,y
      *
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js
index 5f48f74d..f9411f48 100755
--- a/js/tools/SelectionTool.js
+++ b/js/tools/SelectionTool.js
@@ -205,12 +205,12 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
             {
                 this._handleMode = null;
                 this._delta = null;
-                this.DrawHandles();
             }
 
             this.endDraw(event);
             this._canSnap = true;
             this._use3DMode = false;
+            this.DrawHandles();
         }
     },
 
@@ -577,6 +577,7 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
             {
                 // form the translation vector and post translate the matrix by it.
                 delta = vecUtils.vecSubtract( 3, data.pt1, data.pt0 );
+                delta[2] = 0;
                 var transMat = Matrix.Translation( delta );
                 this._moveElements(transMat);
             }
@@ -710,7 +711,7 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
             {
                 return;
             }
-            if(this._target && this._handles)
+            if(this._target && this._handles && (this._targets.length === 1))
             {
                 var len = this._handles.length;
                 var i = 0,
diff --git a/js/tools/Translate3DToolBase.js b/js/tools/Translate3DToolBase.js
index 24a68ad1..07b6d04d 100755
--- a/js/tools/Translate3DToolBase.js
+++ b/js/tools/Translate3DToolBase.js
@@ -18,6 +18,7 @@ var Montage = require("montage/core/core").Montage,
 exports.Translate3DToolBase = Montage.create(ModifierToolBase,
 {
 	_inLocalMode: { value: true, enumerable: true },
+	_clickedOnStage: { value: false },
 
 	HandleDoubleClick : {
 	   value : function()
@@ -47,17 +48,33 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
                         delta[1] = 0;
                         break;
                 }
+                if( (this.application.ninja.selectedElements.length > 1) && this._clickedOnStage )
+                {
+                    this._delta = ~~(delta[this._handleMode]);
+                }
+                else
+                {
+                    this._delta += ~~(delta[this._handleMode]);
+                }
 
-                this._updateDelta(delta, this._handleMode);
             }
-            else if(this._mode === 1)
+            else
             {
-                delta[2] = delta[1];
-                delta[0] = 0;
-                delta[1] = 0;
+                if(this._mode === 1)
+                {
+                    delta[2] = delta[1];
+                    delta[0] = 0;
+                    delta[1] = 0;
+                }
+                else
+                {
+                    delta[2] = 0;
+                }
+                this._delta = delta.slice(0);
             }
 
             var transMat = Matrix.Translation( delta );
+
             if(this._inLocalMode && (this._targets.length === 1) )
             {
                 this._translateLocally(transMat);
@@ -139,7 +156,7 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
 
 			var shouldUpdateStartMat = true;
 
-			if(this._clickedObject === this.application.ninja.currentDocument.documentRoot)
+			if(this._clickedOnStage)
 			{
 				shouldUpdateStartMat = false;
 			}
@@ -152,11 +169,15 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
 			{
 				item = this._targets[i];
 				elt = item.elt;
-				curMat = item.mat;
-
-				glmat4.multiply(curMat, qMat, curMat);
+				curMat = item.mat.slice(0);
 
-				viewUtils.setMatrixForElement( elt, curMat, true);
+//				glmat4.multiply(curMat, qMat, curMat);
+//
+//				viewUtils.setMatrixForElement( elt, curMat, true);
+                curMat[12] += transMat[12];
+                curMat[13] += transMat[13];
+                curMat[14] += transMat[14];
+                viewUtils.setMatrixForElement( elt, curMat, true);
 
 				if(shouldUpdateStartMat)
 				{
@@ -198,6 +219,19 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
                                                 "translateTool",
                                                 previousStyles
                                               );
+                if(this._origin && this._delta)
+                {
+                    if(this._handleMode !== null)
+                    {
+                        this._origin[this._handleMode] += this._delta;
+                    }
+                    else
+                    {
+                        this._origin[0] += this._delta[0];
+                        this._origin[1] += this._delta[1];
+