Merge branch 'refs/heads/Timeline' into Timeline_updated

1 files changed, 2 insertions, 1 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 31bdd217..ef353490 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -192,6 +192,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     handleDeleteLayerClick:{
         value:function(event){
             event.stopPropagation();
+            this._deleteKeyDown=false;
             if(this.application.ninja.currentSelectedContainer.id==="UserContent"){
                 this._hashKey="123";
             }
@@ -574,7 +575,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     drawTimeMarkers:{
         value:function(){
             var i;
-            var totalMarkers = Math.floor(this.track_container.offsetWidth / 80);
+            var totalMarkers = Math.floor(this.time_markers.offsetWidth / 80);
             for(i=0;i<totalMarkers;i++){
                 var timeMark = document.createElement("div");
                 var markValue = this.calculateTimeMarkerValue(i);