aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
diff options
context:
space:
mode:
authorKruti Shah2012-04-12 09:08:32 -0700
committerKruti Shah2012-04-12 09:08:32 -0700
commitec34a41b953de6d714aebdd579b7cc8cc76d43d1 (patch)
treee292c8f8f76f71e17e636dd71df0aa46b8677d99 /js/panels/Timeline
parenta9050f96d814469f420bcf3630d16d576b62258e (diff)
downloadninja-ec34a41b953de6d714aebdd579b7cc8cc76d43d1.tar.gz
Timeline:Changing function name
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js5
1 files changed, 2 insertions, 3 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 20e217e9..d18617f7 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -809,7 +809,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
809 } 809 }
810 thingToPush.layerData.layerName = newLayerName; 810 thingToPush.layerData.layerName = newLayerName;
811 thingToPush.layerData.layerID = this.currentLayerNumber; 811 thingToPush.layerData.layerID = this.currentLayerNumber;
812 thingToPush.parentElementUUID = this.hashKey;
813 thingToPush.parentElement = this.application.ninja.currentSelectedContainer; 812 thingToPush.parentElement = this.application.ninja.currentSelectedContainer;
814 813
815 // Are there styles to add? 814 // Are there styles to add?
@@ -841,7 +840,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
841 var myIndex = this.layerRepetition.selectedIndexes[0]; 840 var myIndex = this.layerRepetition.selectedIndexes[0];
842 this.arrLayers.splice(myIndex, 1); 841 this.arrLayers.splice(myIndex, 1);
843 var selectIndex = this.arrLayers.length; 842 var selectIndex = this.arrLayers.length;
844 this.searchHighestTrackDuration(); 843 this.resetMasterDuration();
845 if(selectIndex>0){ 844 if(selectIndex>0){
846 this.selectLayer(selectIndex-1); 845 this.selectLayer(selectIndex-1);
847 } 846 }
@@ -851,7 +850,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
851 } 850 }
852 }, 851 },
853 852
854 searchHighestTrackDuration:{ 853 resetMasterDuration:{
855 value:function(){ 854 value:function(){
856 855
857 var trackDuration; 856 var trackDuration;