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>
---
 .../Timeline/TimelinePanel.reel/TimelinePanel.html | 49 ++++++++++++++++++++--
 1 file changed, 45 insertions(+), 4 deletions(-)
 mode change 100755 => 100644 js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html

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

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
old mode 100755
new mode 100644
index 29bf6eb3..2a84c21a
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -24,7 +24,8 @@
                         "trackRepetition" : {"@" : "repetition2"},
                         "playhead": {"#": "playhead"},
                         "playheadmarker": {"#": "playhead_marker"},
-                        "timetext" : {"#": "time_text"}
+                        "timetext" : {"#": "time_text"},
+                        "timebar" : {"#": "time_bar"}
                     }
                 },
 
@@ -143,6 +144,36 @@
 	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.tweens",
 	            			"oneway" : false
 	            		},
+                        "animatedElement" : {
+                            "boundObject" : {"@" : "repetition2"},
+            	            "boundObjectPropertyPath" : "objectAtCurrentIteration.animatedElement",
+            	            "oneway" : false
+                        },
+	            		"arrStyleTracks" : {
+	            			"boundObject" : {"@" : "repetition2"},
+	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.arrStyleTracks",
+	            			"oneway" : false
+	            		},
+                        "isTrackAnimated" : {
+                            "boundObject" : {"@" : "repetition2"},
+            	            "boundObjectPropertyPath" : "objectAtCurrentIteration.isTrackAnimated",
+            	            "oneway" : false
+                        },
+                        "trackDuration" : {
+                            "boundObject" : {"@" : "repetition2"},
+                        	"boundObjectPropertyPath" : "objectAtCurrentIteration.trackDuration",
+                        	"oneway" : false
+                        },
+                        "animationName" : {
+                            "boundObject" : {"@" : "repetition2"},
+                            "boundObjectPropertyPath" : "objectAtCurrentIteration.animationName",
+                            "oneway" : false
+                        },
+                        "currentKeyframeRule" : {
+                            "boundObject" : {"@" : "repetition2"},
+                        	"boundObjectPropertyPath" : "objectAtCurrentIteration.currentKeyframeRule",
+                        	"oneway" : false
+                        },
 	            		"isMainCollapsed" : {
 	            			"boundObject" : {"@" : "repetition2"},
 	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.isMainCollapsed",
@@ -162,7 +193,12 @@
 	            			"boundObject" : {"@" : "repetition2"},
 	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed",
 	            			"oneway" : false
-	            		}
+	            		},
+                        "trackPosition" : {
+                            "boundObject" : {"@" : "repetition2"},
+            	            "boundObjectPropertyPath" : "objectAtCurrentIteration.trackPosition",
+            	            "oneway" : false
+                        }
 	            	}
 	            }
             }
@@ -193,7 +229,9 @@
 
                         
                         <div id="user_layers" class="userlayers">
-                            <div id="master_layer" class="masterlayer">Master Layer</div>
+                            <div id="master_layer" class="masterlayer">
+                                <div>Master Layer</div>
+                            </div>
                             <div id="container-layers">
                             	<div id="container-layer"></div>
                             </div>
@@ -202,6 +240,7 @@
                         <div id="timeline_gutter" class="timelinegutter">
                             <div id="newlayer_button" class="newlayerbutton"></div>
                             <div id="deletelayer_button" class="deletelayerbutton"></div>
+                            <input id="end_hottext" class="endhottext hottext">
                         </div>
                     </div>
                 </div>
@@ -220,7 +259,9 @@
                         <div id="layer_tracks" class="tl_layertracks">
                         	<div class="layout-tracks">
 	                            <div id="playhead_marker" class="playheadmarker"></div>
-	                            <div id="master_track" class="mastertrack"></div>
+	                            <div id="master_track" class="mastertrack">
+                                    <div id="time_bar" class="timebar"></div>
+	                            </div>
 	                            <div id="container-tracks" class="container-tracks">
 	                            	<div id="container-track"></div>
 	                            </div>
-- 
cgit v1.2.3


From 4d1f1d02e9e443485357c482432938fd0d9f757d Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Thu, 23 Feb 2012 07:57:17 -0800
Subject: Redo timeline resize code

Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
 .../Timeline/TimelinePanel.reel/TimelinePanel.html | 25 ++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

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

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 2a84c21a..33145028 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -25,7 +25,9 @@
                         "playhead": {"#": "playhead"},
                         "playheadmarker": {"#": "playhead_marker"},
                         "timetext" : {"#": "time_text"},
-                        "timebar" : {"#": "time_bar"}
+                        "timebar" : {"#": "time_bar"},
+                        "container_tracks" : {"#" : "container-tracks"},
+                        "end_hottext" : {"@" : "endHottext"}
                     }
                 },
 
@@ -200,7 +202,19 @@
             	            "oneway" : false
                         }
 	            	}
-	            }
+	            },
+                "endHottext" : {
+                    "module": "js/components/hottextunit.reel",
+            	    "name": "HotTextUnit",
+            	    "properties": {
+            	        "element": {"#": "end_hottext"},
+            	        "maxValue" : 100000,
+                        "minValue" : 1,
+                        "acceptableUnits" : "sec",
+                        "units" : "sec",
+                        "value" : 25
+            	    }
+                }
             }
         </script>
 
@@ -240,7 +254,7 @@
                         <div id="timeline_gutter" class="timelinegutter">
                             <div id="newlayer_button" class="newlayerbutton"></div>
                             <div id="deletelayer_button" class="deletelayerbutton"></div>
-                            <input id="end_hottext" class="endhottext hottext">
+                            <input id="end_hottext" class="endhottext">
                         </div>
                     </div>
                 </div>
@@ -250,9 +264,8 @@
                 <div id="timeline_rightpane" class="tl_rightpane">
                     <div id="right_inside" class="rightinside">
                     	<div class="layout_markers">
-	                        <div id="timeline_markers" class="timelinemarkers">
-	                            <div id="playhead" class="playhead"></div>
-	                        </div>
+                            <div id="playhead" class="playhead"></div>
+	                        <div id="timeline_markers" class="timelinemarkers"></div>
                     	</div>
 
 
-- 
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.

---
 .../Timeline/TimelinePanel.reel/TimelinePanel.html | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)

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

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 33145028..c964936c 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -110,6 +110,41 @@
 	            			"boundObject" : {"@" : "repetition1"},
 	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed",
 	            			"oneway" : false
+	            		},
+	            		"dtextPositionX" : {
+	            			"boundObject" : {"@" : "repetition1"},
+	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.dtextPositionX",
+	            			"oneway" : false
+	            		},
+	            		"dtextPositionY" : {
+	            			"boundObject" : {"@" : "repetition1"},
+	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.dtextPositionY",
+	            			"oneway" : false
+	            		},
+	            		"dtextSkewX" : {
+	            			"boundObject" : {"@" : "repetition1"},
+	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.dtextSkewX",
+	            			"oneway" : false
+	            		},
+	            		"dtextSkewY" : {
+	            			"boundObject" : {"@" : "repetition1"},
+	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.dtextSkewY",
+	            			"oneway" : false
+	            		},
+	            		"dtextScaleX" : {
+	            			"boundObject" : {"@" : "repetition1"},
+	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.dtextScaleX",
+	            			"oneway" : false
+	            		},
+	            		"dtextScaleY" : {
+	            			"boundObject" : {"@" : "repetition1"},
+	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.dtextScaleY",
+	            			"oneway" : false
+	            		},
+	            		"dtextRotate" : {
+	            			"boundObject" : {"@" : "repetition1"},
+	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.dtextRotate",
+	            			"oneway" : false
 	            		}
 	            	}
 	            },
-- 
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/TimelinePanel.reel/TimelinePanel.html | 5 +++++
 1 file changed, 5 insertions(+)

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

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 33145028..0c302436 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.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 f97080989ee988c1e613915c2d246dc17b104b3b Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Fri, 24 Feb 2012 13:27:33 -0800
Subject: clearing the old local setting and using the new version/prefix local
 settings.

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

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

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 0c302436..0fd5b05d 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -264,7 +264,7 @@
                     </div>
                 </div>
 
-                <div id="layer_resizer" class="layerresizer"></div>
+                <div data-montage-id="layer_resizer" class="layerresizer"></div>
 
                 <div id="timeline_rightpane" class="tl_rightpane">
                     <div id="right_inside" class="rightinside">
-- 
cgit v1.2.3