diff options
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 3 |
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, { | |||
192 | handleDeleteLayerClick:{ | 192 | handleDeleteLayerClick:{ |
193 | value:function(event){ | 193 | value:function(event){ |
194 | event.stopPropagation(); | 194 | event.stopPropagation(); |
195 | this._deleteKeyDown=false; | ||
195 | if(this.application.ninja.currentSelectedContainer.id==="UserContent"){ | 196 | if(this.application.ninja.currentSelectedContainer.id==="UserContent"){ |
196 | this._hashKey="123"; | 197 | this._hashKey="123"; |
197 | } | 198 | } |
@@ -574,7 +575,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
574 | drawTimeMarkers:{ | 575 | drawTimeMarkers:{ |
575 | value:function(){ | 576 | value:function(){ |
576 | var i; | 577 | var i; |
577 | var totalMarkers = Math.floor(this.track_container.offsetWidth / 80); | 578 | var totalMarkers = Math.floor(this.time_markers.offsetWidth / 80); |
578 | for(i=0;i<totalMarkers;i++){ | 579 | for(i=0;i<totalMarkers;i++){ |
579 | var timeMark = document.createElement("div"); | 580 | var timeMark = document.createElement("div"); |
580 | var markValue = this.calculateTimeMarkerValue(i); | 581 | var markValue = this.calculateTimeMarkerValue(i); |