aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Duran2012-04-12 09:08:55 -0700
committerJonathan Duran2012-04-12 09:08:55 -0700
commita8f9087b7daf7d48070bbeb4fff1c25ade413909 (patch)
treef9bec620a592c38edfde17052eed6b2bbc952840
parent7547b87f99a3a8903955e5b026b0a4ea889fb87a (diff)
parentec34a41b953de6d714aebdd579b7cc8cc76d43d1 (diff)
downloadninja-a8f9087b7daf7d48070bbeb4fff1c25ade413909.tar.gz
Merge branch 'refs/heads/timeline-kruti-local' into TimelineUber
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 55c7162d..39d1ffc6 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -837,7 +837,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
837 var myIndex = this.layerRepetition.selectedIndexes[0]; 837 var myIndex = this.layerRepetition.selectedIndexes[0];
838 this.arrLayers.splice(myIndex, 1); 838 this.arrLayers.splice(myIndex, 1);
839 var selectIndex = this.arrLayers.length; 839 var selectIndex = this.arrLayers.length;
840 this.searchHighestTrackDuration(); 840 this.resetMasterDuration();
841 if(selectIndex>0){ 841 if(selectIndex>0){
842 this.selectLayer(selectIndex-1); 842 this.selectLayer(selectIndex-1);
843 } 843 }
@@ -847,8 +847,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
847 } 847 }
848 }, 848 },
849 849
850 searchHighestTrackDuration:{ 850 resetMasterDuration:{
851 value:function () { 851 value:function(){
852 852
853 var trackDuration; 853 var trackDuration;
854 var length = this.arrLayers.length; 854 var length = this.arrLayers.length;