From 3bebf2b279d8f4da0439a4e3de1254c4292d0cac Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Fri, 16 Mar 2012 13:39:11 -0700
Subject: Timeline:  Hook up data binding for changes on subproperties.

---
 js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 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 14c5f1c8..34860ae7 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -77,7 +77,12 @@
                         	"boundObject" : {"@" : "repetition1"},
                         	"boundObjectPropertyPath" : "objectAtCurrentIteration.layerData",
                         	"oneway" : false
-                        }
+                        },
+                        "bindingPoint" : {
+            	            "boundObject" : {"@" : "repetition1"},
+            	            "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData.triggerBinding",
+            	            "oneway" : false
+            	        }
 	            	}
 	            },
 	            
@@ -107,7 +112,13 @@
             	            "boundObject" : {"@" : "repetition2"},
             	            "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData",
             	            "oneway" : false
+            	        },
+                        "bindingPoint" : {
+            	            "boundObject" : {"@" : "repetition2"},
+            	            "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData.triggerBinding",
+            	            "oneway" : false
             	        }
+            	        
 	            	}
 	            },
                 "endHottext" : {
@@ -197,4 +208,4 @@
     	</div>
 
     </body>
-</html>
\ No newline at end of file
+</html>
-- 
cgit v1.2.3


From 6b5cdc7f3b59a70b506b4ac5c8a4d105c90c713c Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Fri, 16 Mar 2012 15:04:13 -0700
Subject: Bug fix and cleanup

Cleaning up unneeded code for one element per layer support and fixing some bugs with selection and layer sync.

Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
 js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 4 ----
 1 file changed, 4 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 14c5f1c8..9d7a1d44 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -22,8 +22,6 @@
                         "timeline_leftpane" : {"#" : "timeline_leftpane"},
                         "layer_tracks": {"#": "layer_tracks"},
                         "master_track": {"#": "master_track"},
-                        "newlayer_button": {"#": "newlayer_button"},
-                        "deletelayer_button": {"#": "deletelayer_button"},
                         "time_markers" : {"#": "timeline_markers"},
                         "layerRepetition" : {"@": "repetition1"},
                         "trackRepetition" : {"@" : "repetition2"},
@@ -159,8 +157,6 @@
                         </div>
 
                         <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">
                         </div>
                     </div>
-- 
cgit v1.2.3


From 0e24b9dc875cefb1010a9e2b507c19b77e4d9811 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Tue, 20 Mar 2012 17:37:11 -0700
Subject: Timeline: fix layer and style select problems.

---
 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 6e7d410c..2e0bf7dd 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -19,7 +19,7 @@
                         "element": {"#": "timeline_panel"},
                         "user_layers": {"#": "user_layers"},
                         "track_container": {"#": "right_inside"},
-                        "timeline_leftpane" : {"#" : "timeline_leftpane"},
+                        "timeline_leftpane" : {"#" : "leftpane_inside"},
                         "layer_tracks": {"#": "layer_tracks"},
                         "master_track": {"#": "master_track"},
                         "time_markers" : {"#": "timeline_markers"},
-- 
cgit v1.2.3


From d555b8e68bb672be620e15171039ab9ec8f1fabd Mon Sep 17 00:00:00 2001
From: Kruti Shah
Date: Mon, 26 Mar 2012 11:08:04 -0700
Subject: Timeline : Adding Zoom Slider

Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
---
 .../Timeline/TimelinePanel.reel/TimelinePanel.html    | 19 +++++++++++++++++++
 1 file changed, 19 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 2e0bf7dd..42921a2d 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -119,6 +119,24 @@
             	        
 	            	}
 	            },
+
+                "timelineZoomSlider":{
+                    "module":"js/components/slider.reel",
+                    "name":"Slider",
+                    "properties":{
+                        "element":{"#":"tl_slider"},
+                        "maxValue" : 10000,
+                        "minValue" : 1000
+                    },
+                    "bindings": {
+                        "value": {
+                            "boundObject": {"@": "owner"},
+                            "boundObjectPropertyPath": "millisecondsOffset",
+                            "oneway": false
+                        }
+                    }
+                },
+
                 "endHottext" : {
                     "module": "js/components/hottextunit.reel",
             	    "name": "HotTextUnit",
@@ -168,6 +186,7 @@
                         </div>
 
                         <div id="timeline_gutter" class="timelinegutter">
+                            <div id="tl_slider" class="tl_slider"></div>
                             <input id="end_hottext" class="endhottext">
                         </div>
                     </div>
-- 
cgit v1.2.3


From 8ef667315ca6a81bb1369943eaf3643ae2db5037 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Mon, 26 Mar 2012 17:04:28 -0700
Subject: Timeline: Drag and Drop of layers.

---
 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 2e0bf7dd..3833a891 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -162,7 +162,7 @@
                             <div id="master_layer" class="masterlayer">
                                 <div>Master Layer</div>
                             </div>
-                            <div id="container-layers">
+                            <div id="container-layers" style="position: relative;" class="container-layers">
                             	<div id="container-layer"></div>
                             </div>
                         </div>
-- 
cgit v1.2.3


From 4c492e2f9d01a699aba8ccdd1a2b04238749ea3c Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Tue, 10 Apr 2012 14:49:20 -0700
Subject: Timeline: New Features: Tag name now present in each layer.
 Configuration dropdown in Master Layer; Show Only Animated Layers toggle.

---
 js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 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 9eb126e0..09c1f98c 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -32,7 +32,10 @@
                         "container_tracks" : {"#" : "container-tracks"},
                         "end_hottext" : {"@" : "endHottext"},
                         "container_layers" : {"#" : "container-layers"},
-                        "timeline_disabler" : {"#" : "timeline-disabler"}
+                        "timeline_disabler" : {"#" : "timeline-disabler"},
+                        "checkable_relative" : {"#" : "checkable_relative"},
+                        "checkable_absolute" : {"#" : "checkable_absolute"},
+                        "checkable_animated" : {"#" : "checkable_animated"}
                     }
                 },
 
@@ -179,6 +182,14 @@
                         <div id="user_layers" class="userlayers">
                             <div id="master_layer" class="masterlayer">
                                 <div>Master Layer</div>
+                                <div class="tl-configbutton">
+                                	<div class="tl-dropdown">
+										<div class="checkable checked" data-montage-id="checkable_relative">Use relative positioning</div>
+										<div class="checkable" data-montage-id="checkable_absolute">Use absolute positioning</div>
+										<div class="nj-divider divider-horizontal"></div>
+                                		<div class="checkable" data-montage-id="checkable_animated">Show only animated layers</div>
+                                	</div>
+                                </div>
                             </div>
                             <div id="container-layers" style="position: relative;" class="container-layers">
                             	<div id="container-layer"></div>
-- 
cgit v1.2.3


From 79e9e90afa0b42238d44057eb518ca50a47a4357 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Wed, 11 Apr 2012 16:18:33 -0700
Subject: Timeline: Change Master Layer configuration menu to be on click; bug
 fix: Master Layer config menu does not scroll with layers. Bug fix: New
 layers do not take into account "show only animated layers" feature.

---
 .../Timeline/TimelinePanel.reel/TimelinePanel.html | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 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 09c1f98c..5234b43d 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -35,7 +35,8 @@
                         "timeline_disabler" : {"#" : "timeline-disabler"},
                         "checkable_relative" : {"#" : "checkable_relative"},
                         "checkable_absolute" : {"#" : "checkable_absolute"},
-                        "checkable_animated" : {"#" : "checkable_animated"}
+                        "checkable_animated" : {"#" : "checkable_animated"},
+                        "tl_configbutton" : {"#" : "tl-configbutton"}
                     }
                 },
 
@@ -181,15 +182,18 @@
                         
                         <div id="user_layers" class="userlayers">
                             <div id="master_layer" class="masterlayer">
-                                <div>Master Layer</div>
-                                <div class="tl-configbutton">
-                                	<div class="tl-dropdown">
-										<div class="checkable checked" data-montage-id="checkable_relative">Use relative positioning</div>
-										<div class="checkable" data-montage-id="checkable_absolute">Use absolute positioning</div>
-										<div class="nj-divider divider-horizontal"></div>
-                                		<div class="checkable" data-montage-id="checkable_animated">Show only animated layers</div>
-                                	</div>
+                                <div class="layer-master">Master Layer
+	                                <div class="tl-configbutton" data-montage-id="tl-configbutton">
+	                                	<div class="tl-dropdown">
+											<div class="checkable checked" data-montage-id="checkable_relative">Use relative positioning</div>
+											<div class="checkable" data-montage-id="checkable_absolute">Use absolute positioning</div>
+											<div class="nj-divider divider-horizontal"></div>
+	                                		<div class="checkable" data-montage-id="checkable_animated">Show only animated layers</div>
+	                                	</div>
+	                                </div>
+                                
                                 </div>
+
                             </div>
                             <div id="container-layers" style="position: relative;" class="container-layers">
                             	<div id="container-layer"></div>
-- 
cgit v1.2.3


From a9d5833fb7ea4f58209b7a30c4e63334ed1a387a Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Wed, 18 Apr 2012 13:47:42 -0700
Subject: Add flag for abs/rel position

Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
 js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 4 ++--
 1 file changed, 2 insertions(+), 2 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 5234b43d..1b7132b9 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -185,8 +185,8 @@
                                 <div class="layer-master">Master Layer
 	                                <div class="tl-configbutton" data-montage-id="tl-configbutton">
 	                                	<div class="tl-dropdown">
-											<div class="checkable checked" data-montage-id="checkable_relative">Use relative positioning</div>
-											<div class="checkable" data-montage-id="checkable_absolute">Use absolute positioning</div>
+											<div class="checkable" data-montage-id="checkable_relative">Use relative positioning</div>
+											<div class="checkable checked" data-montage-id="checkable_absolute">Use absolute positioning</div>
 											<div class="nj-divider divider-horizontal"></div>
 	                                		<div class="checkable" data-montage-id="checkable_animated">Show only animated layers</div>
 	                                	</div>
-- 
cgit v1.2.3


From bcfb200482c26b2bfc0d6577b1eb0de7a19a6762 Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Thu, 26 Apr 2012 16:23:59 -0700
Subject: Removing all "module" declarations and replaced with "prototype" in
 preparation for montage converting to the new "prototype" format fully

---
 .../Timeline/TimelinePanel.reel/TimelinePanel.html | 23 ++++++++--------------
 1 file changed, 8 insertions(+), 15 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 14c5f1c8..daeb9a3c 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!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/>
@@ -13,8 +13,7 @@
         <script type="text/montage-serialization">
             {
                 "owner": {
-                    "module": "js/panels/Timeline/TimelinePanel.reel",
-                    "name": "TimelinePanel",
+                    "prototype": "js/panels/Timeline/TimelinePanel.reel",
                     "properties": {
                         "element": {"#": "timeline_panel"},
                         "user_layers": {"#": "user_layers"},
@@ -39,8 +38,7 @@
                 },
 
                 "timelineResize" : {
-                    "module": "js/panels/Resizer",
-                    "name": "Resizer",
+                    "prototype": "js/panels/Resizer",
                     "properties": {
                         "element": {"#": "layer_resizer"},
                         "panel" : {"#" : "timeline_leftpane"},
@@ -52,8 +50,7 @@
 
                 
 	            "repetition1": {
-	                "module": "montage/ui/repetition.reel",
-	                "name": "Repetition",
+	                "prototype": "montage/ui/repetition.reel",
 	                "properties": {
 	                    "element": {"#": "container-layers"},
 	                    "isSelectionEnabled" : true
@@ -67,8 +64,7 @@
 	                }
 	            },
 	            "layer" : {
-	            	"module" : "js/panels/Timeline/Layer.reel",
-	            	"name" : "Layer",
+	            	"prototype" : "js/panels/Timeline/Layer.reel",
 	            	"properties" : {
 	            		"element": {"#": "container-layer"}
 	            	},
@@ -82,8 +78,7 @@
 	            },
 	            
 	            "repetition2" : {
-	                "module": "montage/ui/repetition.reel",
-	                "name": "Repetition",
+	                "prototype": "montage/ui/repetition.reel",
 	                "properties": {
 	                    "element": {"#": "container-tracks"},
 	                    "isSelectionEnabled" : false
@@ -97,8 +92,7 @@
 	                }
 	            },
 	            "track" : {
-	            	"module" : "js/panels/Timeline/TimelineTrack.reel",
-	            	"name" : "TimelineTrack",
+	            	"prototype" : "js/panels/Timeline/TimelineTrack.reel",
 	            	"properties" : {
 	            		"element": {"#": "container-track"}
 	            	},
@@ -111,8 +105,7 @@
 	            	}
 	            },
                 "endHottext" : {
-                    "module": "js/components/hottextunit.reel",
-            	    "name": "HotTextUnit",
+                    "prototype": "js/components/hottextunit.reel[HotTextUnit]",
             	    "properties": {
             	        "element": {"#": "end_hottext"},
             	        "maxValue" : 100000,
-- 
cgit v1.2.3


From c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Fri, 27 Apr 2012 14:26:41 -0700
Subject: Merge cleanup

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 3 +--
 1 file changed, 1 insertion(+), 2 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 f821ba6f..f10e9ac9 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -119,8 +119,7 @@
 	            },
 
                 "timelineZoomSlider":{
-                    "module":"js/components/slider.reel",
-                    "name":"Slider",
+                    "prototype":"js/components/slider.reel",
                     "properties":{
                         "element":{"#":"tl_slider"},
                         "maxValue" : 10000,
-- 
cgit v1.2.3