aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorAnanya Sen2012-02-22 12:18:25 -0800
committerAnanya Sen2012-02-22 12:18:25 -0800
commitdbf0ca5637a3bca87c21c65ada47f8a4d794f78c (patch)
treeace2a2415ef14662c27cdb2528914bef0a7f9208 /js/panels
parent9aa442da1ac9fd3212b37fa63a36090af47b6808 (diff)
parent27589634d3e8ea52abe8623f8f2cc48ce0aa04c9 (diff)
downloadninja-dbf0ca5637a3bca87c21c65ada47f8a4d794f78c.tar.gz
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/panels')
-rwxr-xr-xjs/panels/Timeline/TimelinePanel.reel/TimelinePanel.js11
1 files changed, 9 insertions, 2 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 44129743..07fee19d 100755
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -429,9 +429,13 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
429 this._LayerUndoIndex = thingToPush.layerID; 429 this._LayerUndoIndex = thingToPush.layerID;
430 this._LayerUndoStatus = true; 430 this._LayerUndoStatus = true;
431 this._TrackUndoObject = newTrack; 431 this._TrackUndoObject = newTrack;
432
433 // Removing clearing the selection - Handled by the selection-controller
434 /*
432 if(_firstLayerDraw){ 435 if(_firstLayerDraw){
433 this.application.ninja.selectionController.executeSelectElement(); 436 this.application.ninja.selectionController.executeSelectElement();
434 } 437 }
438 */
435 439
436 } 440 }
437 } 441 }
@@ -753,9 +757,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
753 this.trackRepetition.selectedIndexes = [layerIndex]; 757 this.trackRepetition.selectedIndexes = [layerIndex];
754 this.currentLayerSelected = this.arrLayers[layerIndex]; 758 this.currentLayerSelected = this.arrLayers[layerIndex];
755 this.currentTrackSelected = this.arrTracks[layerIndex]; 759 this.currentTrackSelected = this.arrTracks[layerIndex];
760 // Selection is being handled by the selection controller
761 /*
756 if(this._captureSelection){ 762 if(this._captureSelection){
757 this.application.ninja.selectionController.selectElements(this.currentLayerSelected.element) 763 this.application.ninja.selectionController.selectElements(this.currentLayerSelected.element)
758 } 764 }
765 */
759 this._captureSelection = true; 766 this._captureSelection = true;
760 } else { 767 } else {
761 this.layerRepetition.selectedIndexes = null; 768 this.layerRepetition.selectedIndexes = null;