aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-21 14:36:41 -0800
committerValerio Virgillito2012-02-21 14:36:41 -0800
commit1d2c928c35ccc7cd875a329b2e235f34eb4f0c0d (patch)
treefebe5a23c3667523e90de031987a11764f417da7 /js/panels/Timeline/TimelinePanel.reel
parentb1daf0b285a4a96bfd0086709c20e3682d75551a (diff)
parentf9d34a54baf61ccdf77732b1aaedb29d296b8c2e (diff)
downloadninja-1d2c928c35ccc7cd875a329b2e235f34eb4f0c0d.tar.gz
Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal into file-io
Conflicts: js/controllers/document-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel')
-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;