4 files changed, 16 insertions, 12 deletions

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 7ee0ca16..7fb57396 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -6,10 +6,7 @@
 
 var Montage = require("montage/core/core").Montage;
 var Component = require("montage/ui/component").Component;
-var Layer = require("js/panels/Timeline/Layer.reel").Layer;
-var TimelineTrack = require("js/panels/Timeline/TimelineTrack.reel").TimelineTrack;
 var nj = require("js/lib/NJUtils").NJUtils;
-var ElementMediator = require("js/mediators/element-mediator").ElementMediator;
 
 var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 
@@ -280,6 +277,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     _scrollTracks: {
         value: false
     },
+    useAbsolutePosition:{
+        value:true
+    },
     /* === END: Models === */
     /* === BEGIN: Draw cycle === */
     prepareForDraw:{
@@ -1167,7 +1167,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                         this.handleCheckableClick(event);
                 }
                 this.checkable_absolute.classList.remove("checked");
-                // TODO: Use relative positioning
+            this.useAbsolutePosition = false;
         }
     },
     handleAbsoluteClick: {
@@ -1176,7 +1176,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                         this.handleCheckableClick(event);
                 }
                 this.checkable_relative.classList.remove("checked");
-                // TODO: Use absolute positioning.
+            this.useAbsolutePosition = true;
         }
     },
     handleCheckableClick: {
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 145b03ef..aacddd3b 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -548,6 +548,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     handleNewTween:{
         value:function (ev) {
             if (ev.offsetX > this.tweens[this.tweens.length - 1].tweenData.keyFramePosition) {
+                var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID);
+                this.application.ninja.timeline.selectLayer(selectedIndex, false);
                 this.insertTween(ev.offsetX);
             } else {
                 this.splitTween(ev);
@@ -557,6 +559,9 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
 
     insertTween:{
         value:function (clickPos) {
+            var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID);
+                        this.application.ninja.timeline.selectLayer(selectedIndex, true);
+
             var currentMillisecPerPixel = Math.floor(this.application.ninja.timeline.millisecondsOffset / 80);
             var currentMillisec = currentMillisecPerPixel * clickPos;
             this.trackDuration = currentMillisec;
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index e4fb42b3..7dcd397c 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -6,7 +6,6 @@
 
 var Montage = require("montage/core/core").Montage;
 var Component = require("montage/ui/component").Component;
-var ElementsMediator = require("js/mediators/element-mediator").ElementMediator;
 
 var Tween = exports.Tween = Montage.create(Component, {
 
@@ -186,7 +185,7 @@ var Tween = exports.Tween = Montage.create(Component, {
 
     setAbsoluteTweenProperties:{
         value:function (eventDetail) {
-            console.log(eventDetail);
+            //console.log(eventDetail);
             if (this.parentComponent.parentComponent.animatedElement.offsetTop != this.tweenedProperties["top"] && this.parentComponent.parentComponent.animatedElement.offsetLeft != this.tweenedProperties["left"]) {
                 this.tweenedProperties["top"] = this.parentComponent.parentComponent.animatedElement.offsetTop;
                 this.tweenedProperties["left"] = this.parentComponent.parentComponent.animatedElement.offsetLeft;
@@ -200,7 +199,7 @@ var Tween = exports.Tween = Montage.create(Component, {
 
     setRelativeTweenProperties:{
         value:function(eventDetail){
-
+            //console.log(eventDetail);
         }
     },
 
@@ -228,8 +227,8 @@ var Tween = exports.Tween = Montage.create(Component, {
             var currentTop = this.tweenedProperties["top"] + "px";
             var currentLeft = this.tweenedProperties["left"] + "px";
 
-            ElementsMediator.setProperty([this.parentComponent.parentComponent.animatedElement], "top", [currentTop], "Change", "tween");
-            ElementsMediator.setProperty([this.parentComponent.parentComponent.animatedElement], "left", [currentLeft], "Change", "tween");
+            this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], "top", [currentTop], "Change", "tween");
+            this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], "left", [currentLeft], "Change", "tween");
 
         }
     },