aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
diff options
context:
space:
mode:
authorJonathan Duran2012-02-27 10:23:05 -0800
committerJonathan Duran2012-02-27 10:23:05 -0800
commitfb8aacbadba8dffb9619eb16e4626c197dc9264d (patch)
tree92567595109f536ff14cf3c4246e7305193eb561 /js/panels/Timeline
parent7965d1e56ee6e02d049f4e1a8eb5dad291967015 (diff)
downloadninja-fb8aacbadba8dffb9619eb16e4626c197dc9264d.tar.gz
Timeline : Selection Fix
Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js14
1 files changed, 11 insertions, 3 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 2143dafd..797a7cbf 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -230,8 +230,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
230 { 230 {
231 this._openDoc=true; 231 this._openDoc=true;
232 NJevent('newLayer',{key:this._hashKey,ele:this.application.ninja.currentDocument.documentRoot.children[myIndex]}) 232 NJevent('newLayer',{key:this._hashKey,ele:this.application.ninja.currentDocument.documentRoot.children[myIndex]})
233// this.selectLayer(myIndex);
234// TimelineTrack.retrieveStoredTweens();
235 myIndex++; 233 myIndex++;
236 } 234 }
237 }else{ 235 }else{
@@ -488,7 +486,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
488 if(this._openDoc){ 486 if(this._openDoc){
489 event.detail.ele.uuid =nj.generateRandom(); 487 event.detail.ele.uuid =nj.generateRandom();
490 thingToPush.elementsList.push(event.detail.ele); 488 thingToPush.elementsList.push(event.detail.ele);
491 this._openDoc=false;
492 } 489 }
493 490
494 newTrack.trackID = this.currentLayerNumber; 491 newTrack.trackID = this.currentLayerNumber;
@@ -534,6 +531,11 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
534 this.selectLayer(0); 531 this.selectLayer(0);
535 532
536 } 533 }
534
535 if(this._openDoc){
536 this.hashElementMapToLayer.setItem(event.detail.ele.uuid, event.detail.ele,this.currentLayerSelected);
537 this._openDoc=false;
538 }
537 this._LayerUndoObject = thingToPush; 539 this._LayerUndoObject = thingToPush;
538 this._LayerUndoIndex = thingToPush.layerID; 540 this._LayerUndoIndex = thingToPush.layerID;
539 this._LayerUndoStatus = true; 541 this._LayerUndoStatus = true;
@@ -733,6 +735,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
733 } 735 }
734 } 736 }
735 hashLayerObject[key][index] = value; 737 hashLayerObject[key][index] = value;
738 console.log(hashLayerObject)
736 this.counter = 0; 739 this.counter = 0;
737 } 740 }
738 }, 741 },
@@ -827,6 +830,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
827 } 830 }
828 this.mappingArray[key]["ele"] = value; 831 this.mappingArray[key]["ele"] = value;
829 this.mappingArray[key].layerID = layer.layerID; 832 this.mappingArray[key].layerID = layer.layerID;
833 console.log(this.mappingArray)
830 834
831 } 835 }
832 }, 836 },
@@ -863,6 +867,10 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
863 this.trackRepetition.selectedIndexes = [layerIndex]; 867 this.trackRepetition.selectedIndexes = [layerIndex];
864 this.currentLayerSelected = this.arrLayers[layerIndex]; 868 this.currentLayerSelected = this.arrLayers[layerIndex];
865 this.currentTrackSelected = this.arrTracks[layerIndex]; 869 this.currentTrackSelected = this.arrTracks[layerIndex];
870 if(this._captureSelection){
871 this.application.ninja.selectionController.selectElements(this.currentLayerSelected.elementsList)
872 }
873 this._captureSelection = true;
866 } else { 874 } else {
867 this.layerRepetition.selectedIndexes = null; 875 this.layerRepetition.selectedIndexes = null;
868 this.trackRepetition.selectedIndexes = null; 876 this.trackRepetition.selectedIndexes = null;