From b7402018659cf8058d5646c08b2a916492269e33 Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Thu, 23 Feb 2012 07:37:17 -0800
Subject: Timeline Reset to clean Master branch.  Code scrub.

Fresh copy of ninja-internal/master with Timeline folder copied in to resolved merge issues.

Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
 js/panels/Timeline/Layer.reel/Layer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/panels/Timeline/Layer.reel/Layer.html')

diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html
index dd819b2b..e262afe2 100644
--- a/js/panels/Timeline/Layer.reel/Layer.html
+++ b/js/panels/Timeline/Layer.reel/Layer.html
@@ -153,7 +153,7 @@
 				<div class="label-style">
 					<span class="collapsible-label">Style</span>
 					<span class="clicker-style collapsible-clicker"></span>
-					<div class="cssbutton button-delete"></div>
+					<div class="cssbutton button-delete disabled"></div>
 					<div class="cssbutton button-add"></div>
 				</div>
 				<div class="content-style collapsible-content">
-- 
cgit v1.2.3


From 0b18fb2fef124a26204d5dba90cd82c975b69df3 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Thu, 23 Feb 2012 17:06:48 -0800
Subject: Timeline: Add hottext fields to layers and serialize them throughout.

---
 js/panels/Timeline/Layer.reel/Layer.html | 153 ++++++++++++++++++++++++++++---
 1 file changed, 141 insertions(+), 12 deletions(-)

(limited to 'js/panels/Timeline/Layer.reel/Layer.html')

diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html
index e262afe2..df03cbb3 100644
--- a/js/panels/Timeline/Layer.reel/Layer.html
+++ b/js/panels/Timeline/Layer.reel/Layer.html
@@ -87,7 +87,140 @@
 	            			"oneway" : false
 	            		}
 	            	}
-	            }
+	            },
+				"dtext-position-x" : {
+                    "module": "js/components/hottextunit.reel",
+            	    "name": "HotTextUnit",
+            	    "properties": {
+            	        "element": {"#": "position-x"},
+            	        "maxValue" : 100000,
+                        "minValue" : -100000,
+                        "acceptableUnits" : "px",
+                        "units" : "px",
+                        "value" : 0
+            	    },
+	                "bindings": {
+	                    "value": {
+	                        "boundObject": {"@": "owner"},
+	                        "boundObjectPropertyPath": "dtextPositionX",
+	                        "oneway": false
+	                    }
+	                }
+				},
+				"dtext-position-y" : {
+                    "module": "js/components/hottextunit.reel",
+            	    "name": "HotTextUnit",
+            	    "properties": {
+            	        "element": {"#": "position-y"},
+            	        "maxValue" : 100000,
+                        "minValue" : -100000,
+                        "acceptableUnits" : "px",
+                        "units" : "px",
+                        "value" : 0
+            	    },
+	                "bindings": {
+	                    "value": {
+	                        "boundObject": {"@": "owner"},
+	                        "boundObjectPropertyPath": "dtextPositionY",
+	                        "oneway": false
+	                    }
+	                }
+				},
+				"dtext-scale-x" : {
+                    "module": "js/components/hottextunit.reel",
+            	    "name": "HotTextUnit",
+            	    "properties": {
+            	        "element": {"#": "scale-x"},
+            	        "maxValue" : 100,
+                        "minValue" : 0,
+                        "acceptableUnits" : "%",
+                        "units" : "%",
+                        "value" : 0
+            	    },
+	                "bindings": {
+	                    "value": {
+	                        "boundObject": {"@": "owner"},
+	                        "boundObjectPropertyPath": "dtextScaleX",
+	                        "oneway": false
+	                    }
+	                }
+				},
+				"dtext-scale-y" : {
+                    "module": "js/components/hottextunit.reel",
+            	    "name": "HotTextUnit",
+            	    "properties": {
+            	        "element": {"#": "scale-y"},
+            	        "maxValue" : 100,
+                        "minValue" : 0,
+                        "acceptableUnits" : "%",
+                        "units" : "%",
+                        "value" : 0
+            	    },
+	                "bindings": {
+	                    "value": {
+	                        "boundObject": {"@": "owner"},
+	                        "boundObjectPropertyPath": "dtextScaleY",
+	                        "oneway": false
+	                    }
+	                }
+				},
+				"dtext-skew-x" : {
+                    "module": "js/components/hottextunit.reel",
+            	    "name": "HotTextUnit",
+            	    "properties": {
+            	        "element": {"#": "skew-x"},
+            	        "maxValue" : 100,
+                        "minValue" : 0,
+                        "acceptableUnits" : "%",
+                        "units" : "%",
+                        "value" : 0
+            	    },
+	                "bindings": {
+	                    "value": {
+	                        "boundObject": {"@": "owner"},
+	                        "boundObjectPropertyPath": "dtextSkewX",
+	                        "oneway": false
+	                    }
+	                }
+				},
+				"dtext-skew-y" : {
+                    "module": "js/components/hottextunit.reel",
+            	    "name": "HotTextUnit",
+            	    "properties": {
+            	        "element": {"#": "skew-y"},
+            	        "maxValue" : 100,
+                        "minValue" : 0,
+                        "acceptableUnits" : "%",
+                        "units" : "%",
+                        "value" : 0
+            	    },
+	                "bindings": {
+	                    "value": {
+	                        "boundObject": {"@": "owner"},
+	                        "boundObjectPropertyPath": "dtextSkewY",
+	                        "oneway": false
+	                    }
+	                }
+				},
+				"dtext-rotate" : {
+                    "module": "js/components/hottextunit.reel",
+            	    "name": "HotTextUnit",
+            	    "properties": {
+            	        "element": {"#": "rotation"},
+            	        "maxValue" : 360,
+                        "minValue" : -360,
+                        "acceptableUnits" : "degrees",
+                        "units" : "degrees",
+                        "value" : 0
+            	    },
+	                "bindings": {
+	                    "value": {
+	                        "boundObject": {"@": "owner"},
+	                        "boundObjectPropertyPath": "dtextRotate",
+	                        "oneway": false
+	                    }
+	                }
+				}
             }
         </script>
 	</head>
@@ -109,15 +242,11 @@
 					<div class="layout-table">
 						<div class="layout-row">
 							<div class="layout-cell">X</div>
-							<div class="layout-cell">100px</div>
+							<div class="layout-cell"><div id="position-x"></div></div>
 						</div>
 						<div class="layout-row">
 							<div class="layout-cell">Y</div>
-							<div class="layout-cell">100px</div>
-						</div>
-						<div class="layout-row">
-							<div class="layout-cell">Z</div>
-							<div class="layout-cell">100px</div>
+							<div class="layout-cell"><div id="position-y"></div></div>
 						</div>
 					</div>
 				</div>
@@ -129,23 +258,23 @@
 					<div class="layout-table">
 						<div class="layout-row">
 							<div class="layout-cell">Scale X</div>
-							<div class="layout-cell">100px</div>
+							<div class="layout-cell"><div id="scale-x"></div></div>
 						</div>
 						<div class="layout-row">
 							<div class="layout-cell">Scale Y</div>
-							<div class="layout-cell">100px</div>
+							<div class="layout-cell"><div id="scale-y"></div></div>
 						</div>
 						<div class="layout-row">
 							<div class="layout-cell">Skew X</div>
-							<div class="layout-cell">100px</div>
+							<div class="layout-cell"><div id="skew-x"></div></div>
 						</div>
 						<div class="layout-row">
 							<div class="layout-cell">Skew Y</div>
-							<div class="layout-cell">100px</div>
+							<div class="layout-cell"><div id="skew-y"></div></div>
 						</div>
 						<div class="layout-row">
 							<div class="layout-cell">Rotation</div>
-							<div class="layout-cell">100px</div>
+							<div class="layout-cell"><div id="rotation"></div></div>
 						</div>
 					</div>
 					
-- 
cgit v1.2.3


From 5de5dc6454fe6ca097ce4baf34768c9174a827d9 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Fri, 24 Feb 2012 10:20:04 -0800
Subject: Adding some missing copyrights

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/panels/Timeline/Layer.reel/Layer.html | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'js/panels/Timeline/Layer.reel/Layer.html')

diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html
index e262afe2..a3fbd5b1 100644
--- a/js/panels/Timeline/Layer.reel/Layer.html
+++ b/js/panels/Timeline/Layer.reel/Layer.html
@@ -1,4 +1,9 @@
 <!DOCTYPE html>
+<!-- <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> -->
 <html lang="en">
 	<head>
     	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-- 
cgit v1.2.3


From 1c4e8fbab587e589f348223847d6aac5c2df416b Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Fri, 24 Feb 2012 14:06:57 -0800
Subject: Timeline: Bug fixes: Delete corresponding track when a style is
 deleted from a layer, and fix serialization variable problem.

---
 js/panels/Timeline/Layer.reel/Layer.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'js/panels/Timeline/Layer.reel/Layer.html')

diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html
index d30ef0e3..0bd448f7 100644
--- a/js/panels/Timeline/Layer.reel/Layer.html
+++ b/js/panels/Timeline/Layer.reel/Layer.html
@@ -93,7 +93,7 @@
 	            		}
 	            	}
 	            },
-				"dtext-position-x" : {
+				"dtext_position_x" : {
                     "module": "js/components/hottextunit.reel",
             	    "name": "HotTextUnit",
             	    "properties": {
@@ -112,7 +112,7 @@
 	                    }
 	                }
 				},
-				"dtext-position-y" : {
+				"dtext_position_y" : {
                     "module": "js/components/hottextunit.reel",
             	    "name": "HotTextUnit",
             	    "properties": {
@@ -131,7 +131,7 @@
 	                    }
 	                }
 				},
-				"dtext-scale-x" : {
+				"dtext_scale_x" : {
                     "module": "js/components/hottextunit.reel",
             	    "name": "HotTextUnit",
             	    "properties": {
@@ -150,7 +150,7 @@
 	                    }
 	                }
 				},
-				"dtext-scale-y" : {
+				"dtext_scale_y" : {
                     "module": "js/components/hottextunit.reel",
             	    "name": "HotTextUnit",
             	    "properties": {
@@ -169,7 +169,7 @@
 	                    }
 	                }
 				},
-				"dtext-skew-x" : {
+				"dtext_skew_x" : {
                     "module": "js/components/hottextunit.reel",
             	    "name": "HotTextUnit",
             	    "properties": {
@@ -188,7 +188,7 @@
 	                    }
 	                }
 				},
-				"dtext-skew-y" : {
+				"dtext_skew_y" : {
                     "module": "js/components/hottextunit.reel",
             	    "name": "HotTextUnit",
             	    "properties": {
@@ -207,7 +207,7 @@
 	                    }
 	                }
 				},
-				"dtext-rotate" : {
+				"dtext_rotate" : {
                     "module": "js/components/hottextunit.reel",
             	    "name": "HotTextUnit",
             	    "properties": {
-- 
cgit v1.2.3