aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
diff options
context:
space:
mode:
authorKruti Shah2012-02-08 09:45:29 -0800
committerKruti Shah2012-02-08 09:45:29 -0800
commit6787bda807ad3974b29cab77628cc5c3c1b06a9d (patch)
tree61d2439e2edb0dd9c84b5f32fe35e57707b87637 /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
parent2cfa420f48735e2718cd0824d4e945c72158d0fa (diff)
parent91df2e8030db394060667202a97138db3f871fa5 (diff)
downloadninja-6787bda807ad3974b29cab77628cc5c3c1b06a9d.tar.gz
Merge branch 'refs/heads/Timeline' into Timeline_updated
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js3
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);