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 ++--
 js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js   | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'js/panels')

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>
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 0062affe..ae1489ec 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -305,6 +305,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     _scrollTracks: {
     	value: false
     },
+    useAbsolutePosition:{
+        value:true
+    },
     /* === END: Models === */
     /* === BEGIN: Draw cycle === */
     prepareForDraw:{
@@ -1213,6 +1216,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     		}
     		this.checkable_absolute.classList.remove("checked");
     		// TODO: Use relative positioning
+            this.useAbsolutePosition = false;
     	}
     },
     handleAbsoluteClick: {
@@ -1222,6 +1226,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     		}
     		this.checkable_relative.classList.remove("checked");
     		// TODO: Use absolute positioning.
+            this.useAbsolutePosition = true;
     	}
     },
     handleCheckableClick: {
-- 
cgit v1.2.3