2 files changed, 13 insertions, 4 deletions

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"},
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index cb4fbf07..3fc8eeaf 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -177,7 +177,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         },
         set:function (val) {
             this._masterDuration = val;
-            this.timebar.style.width = (this._masterDuration / 12) + "px";
+            var intDur = Math.round(val/12),
+                        strWidth = intDur + "px";
+            this.timebar.style.width = strWidth;
         }
     },
 
@@ -350,6 +352,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this.container_layers.addEventListener("dragstart", this.handleLayerDragStart.bind(this), false);
             this.container_layers.addEventListener("dragend", this.handleLayerDragEnd.bind(this), false);
             this.container_layers.addEventListener("dragover", this.handleLayerDragover.bind(this), false);
+            //this.container_tracks.addEventListener("dragover", this.handleKeyframeDragover.bind(this), false);
             this.container_layers.addEventListener("drop", this.handleLayerDrop.bind(this), false);
             
             // Bind the handlers for the config menu
@@ -530,8 +533,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                              "deleteLayer",
                              "elementAdded",
                              "elementsRemoved",
-                             "elementReplaced",
-                             "selectionChange"],
+                             "elementReplaced"],
+                             //"selectionChange"],
                 i,
                 arrEventsLength = arrEvents.length;
 
@@ -710,12 +713,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this._openDoc = false;
             this.end_hottext.value = 25;
             this.updateTrackContainerWidth();
-            this.masterDuration = 0;
             // Clear the repetitions
             if (this.arrLayers.length > 0) {
                 this.arrLayers = [];
                 this.arrLayers.length = 0;
             }
+            this.resetMasterDuration();
         }
     },
 
@@ -1498,6 +1501,11 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 this.needsDraw = true;
         }
     },
+    handleKeyframeDragover: {
+        value: function(event) {
+                
+        }
+    },
     handleLayerDragEnd : {
         value: function(event) {
                 this._deleteHelper = true;