From 736956ebba6db338127caeadb429d16bdf6bc375 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Mon, 20 Feb 2012 21:52:57 -0800
Subject: Removing the timeline selection code.
Timeline selection code is now handled by the selection controller and current container change
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 11 +++++++++--
1 file 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, {
this._LayerUndoIndex = thingToPush.layerID;
this._LayerUndoStatus = true;
this._TrackUndoObject = newTrack;
+
+ // Removing clearing the selection - Handled by the selection-controller
+ /*
if(_firstLayerDraw){
- this.application.ninja.selectionController.executeSelectElement();
+ this.application.ninja.selectionController.executeSelectElement();
}
+ */
}
}
@@ -753,9 +757,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
this.trackRepetition.selectedIndexes = [layerIndex];
this.currentLayerSelected = this.arrLayers[layerIndex];
this.currentTrackSelected = this.arrTracks[layerIndex];
+ // Selection is being handled by the selection controller
+ /*
if(this._captureSelection){
- this.application.ninja.selectionController.selectElements(this.currentLayerSelected.element)
+ this.application.ninja.selectionController.selectElements(this.currentLayerSelected.element)
}
+ */
this._captureSelection = true;
} else {
this.layerRepetition.selectedIndexes = null;
--
cgit v1.2.3