Merge branch 'refs/heads/timeline-local' into TimelineUber

2 files changed, 10 insertions, 3 deletions

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 3bcc1401..f9edfca6 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -710,13 +710,14 @@ var Layer = exports.Layer = Montage.create(Component, {
         handleSelectorEditableBlur : {
                 value: function(event) {
                 this.titleSelector.scrollLeft = 0;
+                this.handleSelectorEditableChange(event);
                 }
         },
         handleSelectorEditableChange: {
                 value: function(event) {
-                        var newVal = "ONTD";
-                        if (this._layerEditable.value !== "") {
-                                newVal = this._layerEditable.value;
+                        var newVal = this._layerEditable.enteredValue;
+                        if (this._layerEditable.enteredValue.length === 0) {
+                                newVal = this._layerEditable._preEditValue;
                         }
                         this.dynamicLayerName.value = newVal;
                         this.layerName = newVal;
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 20e217e9..8fec1d7d 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -363,6 +363,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     draw: {
         value: function() {
                 
+
+                
                 // Drag and Drop:
                 // Do we have a helper to append?
             if (this._appendHelper === true) {
@@ -664,6 +666,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         value:function () {
             this.user_layers.scrollTop = this.layout_tracks.scrollTop;
             this.layout_markers.scrollLeft = this.layout_tracks.scrollLeft;
+                this.playheadmarker.style.top = this.layout_tracks.scrollTop + "px";
         }
     },
 
@@ -684,6 +687,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             var clickedPosition = event.target.offsetLeft + event.offsetX;
             this.playhead.style.left = (clickedPosition - 2) + "px";
             this.playheadmarker.style.left = clickedPosition + "px";
+            
+
+                
             var currentMillisecPerPixel = Math.floor(this.millisecondsOffset / 80);
             var currentMillisec = currentMillisecPerPixel * clickedPosition;
             this.updateTimeText(currentMillisec);