From 73c4f7f449ba58e70f7335ef932b23dd450c925b Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Tue, 1 May 2012 17:46:09 -0700
Subject: Timeline: Initial keyframe drag-and-drop interaction.

---
 js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 1 +
 1 file changed, 1 insertion(+)

(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 19709ca7..8ddc81cd 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -31,6 +31,7 @@
                         "container_tracks" : {"#" : "container-tracks"},
                         "end_hottext" : {"@" : "endHottext"},
                         "container_layers" : {"#" : "container-layers"},
+                        "container_tracks" : {"#" : "container-tracks"},
                         "timeline_disabler" : {"#" : "timeline-disabler"},
                         "checkable_relative" : {"#" : "checkable_relative"},
                         "checkable_absolute" : {"#" : "checkable_absolute"},
-- 
cgit v1.2.3


From bafa105c753a139847ef5e0bc8070ce0e8d16f77 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Tue, 8 May 2012 12:04:57 -0700
Subject: Timeline: Bug fix: Account for horizontal scroll when dragging
 keyframes.

---
 js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 3 ++-
 1 file changed, 2 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 8ddc81cd..5c957619 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -20,6 +20,7 @@
                         "track_container": {"#": "right_inside"},
                         "timeline_leftpane" : {"#" : "leftpane_inside"},
                         "layer_tracks": {"#": "layer_tracks"},
+                        "layout_tracks": {"#": "layout_tracks"},
                         "master_track": {"#": "master_track"},
                         "time_markers" : {"#": "timeline_markers"},
                         "layerRepetition" : {"@": "repetition1"},
@@ -211,7 +212,7 @@
 
 
                         <div data-montage-id="layer_tracks" class="tl_layertracks">
-                        	<div class="layout-tracks">
+                        	<div class="layout-tracks" data-montage-id="layout_tracks">
 	                            <div data-montage-id="playhead_marker" class="playheadmarker"></div>
 	                            <div data-montage-id="master_track" class="mastertrack">
                                     <div data-montage-id="time_bar" class="timebar"></div>
-- 
cgit v1.2.3


From f97e4b6ab1db9fb7de18b2e44c1b0edcf2ba072d Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Tue, 12 Jun 2012 16:47:15 -0700
Subject: Timeline: New popup menu for easing choices.

---
 js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 3 ++-
 1 file changed, 2 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 5c957619..73c5ff8d 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -37,7 +37,8 @@
                         "checkable_relative" : {"#" : "checkable_relative"},
                         "checkable_absolute" : {"#" : "checkable_absolute"},
                         "checkable_animated" : {"#" : "checkable_animated"},
-                        "tl_configbutton" : {"#" : "tl-configbutton"}
+                        "tl_configbutton" : {"#" : "tl-configbutton"},
+                        "easingMenu" : {"@" : "easingMenu"}
                     }
                 },
 
-- 
cgit v1.2.3


From f25c0450a5f75ee6937147c361aa95d3305a7e6a Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Thu, 14 Jun 2012 14:32:14 -0700
Subject: Timeline: fix serialization error.

---
 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 73c5ff8d..5c957619 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -37,8 +37,7 @@
                         "checkable_relative" : {"#" : "checkable_relative"},
                         "checkable_absolute" : {"#" : "checkable_absolute"},
                         "checkable_animated" : {"#" : "checkable_animated"},
-                        "tl_configbutton" : {"#" : "tl-configbutton"},
-                        "easingMenu" : {"@" : "easingMenu"}
+                        "tl_configbutton" : {"#" : "tl-configbutton"}
                     }
                 },
 
-- 
cgit v1.2.3


From b5b760ee82e5cc4da176914983a6002cbf86c11a Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Fri, 15 Jun 2012 02:26:56 -0700
Subject: Remove obsolete absolute/relative options from timeline config menu

Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
 js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 5 -----
 1 file changed, 5 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 5c957619..9e2bacd5 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -34,8 +34,6 @@
                         "container_layers" : {"#" : "container-layers"},
                         "container_tracks" : {"#" : "container-tracks"},
                         "timeline_disabler" : {"#" : "timeline-disabler"},
-                        "checkable_relative" : {"#" : "checkable_relative"},
-                        "checkable_absolute" : {"#" : "checkable_absolute"},
                         "checkable_animated" : {"#" : "checkable_animated"},
                         "tl_configbutton" : {"#" : "tl-configbutton"}
                     }
@@ -179,9 +177,6 @@
                                 <div class="layer-master">Master Layer
 	                                <div class="tl-configbutton" data-montage-id="tl-configbutton">
 	                                	<div class="tl-dropdown">
-											<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>
 	                                </div>
-- 
cgit v1.2.3


From 4046fca0daee6e064ee5c67bd0826ac42af7718d Mon Sep 17 00:00:00 2001
From: Kruti Shah
Date: Tue, 19 Jun 2012 10:12:49 -0700
Subject: Locked Elements. Layer Controls

Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
---
 js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 6 +++++-
 1 file changed, 5 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 9e2bacd5..eac361a8 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -35,7 +35,9 @@
                         "container_tracks" : {"#" : "container-tracks"},
                         "timeline_disabler" : {"#" : "timeline-disabler"},
                         "checkable_animated" : {"#" : "checkable_animated"},
-                        "tl_configbutton" : {"#" : "tl-configbutton"}
+                        "tl_configbutton" : {"#" : "tl-configbutton"},
+                        "checkable_lock" : {"#" : "checkable_lock"},
+                        "checkable_visible":{"#" : "checkable_visible"}
                     }
                 },
 
@@ -178,6 +180,8 @@
 	                                <div class="tl-configbutton" data-montage-id="tl-configbutton">
 	                                	<div class="tl-dropdown">
 	                                		<div class="checkable" data-montage-id="checkable_animated">Show only animated layers</div>
+                                            <div class="checkable" data-montage-id="checkable_lock">Lock Layers</div>
+                                            <div class="checkable" data-montage-id="checkable_visible">Visibility of Layers</div>
 	                                	</div>
 	                                </div>
                                 
-- 
cgit v1.2.3