aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js18
1 files changed, 14 insertions, 4 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 6f0b0b58..3c4cfa2e 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -50,6 +50,14 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
50 } 50 }
51 }, 51 },
52 52
53 currentLayerSelected:{
54 value: null
55 },
56
57 currentTrackSelected:{
58 value: null
59 },
60
53 millisecondsOffset:{ 61 millisecondsOffset:{
54 value:1000 62 value:1000
55 }, 63 },
@@ -291,7 +299,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
291 handleNewLayer:{ 299 handleNewLayer:{
292 value:function (event) { 300 value:function (event) {
293 // Add a new layer. It should be added above the currently selected layer, 301 // Add a new layer. It should be added above the currently selected layer,
294 // Or at the end, if no layer is selected. 302 // Or at the top, if no layer is selected.
295 var hashIndex = 0 , hashVariable = 0, layerResult, trackResult, layerObject, trackObject, dLayer, parentNode; 303 var hashIndex = 0 , hashVariable = 0, layerResult, trackResult, layerObject, trackObject, dLayer, parentNode;
296 304
297 this._arrLayersNonEmpty = true; 305 this._arrLayersNonEmpty = true;
@@ -520,8 +528,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
520 handleElementAdded:{ 528 handleElementAdded:{
521 value:function (event) { 529 value:function (event) {
522 this.currentLayerSelected.element.push(event.detail); 530 this.currentLayerSelected.element.push(event.detail);
523 //console.log(this.currentLayerSelected.layerPosition);
524 //console.log(this.arrTracks);
525 } 531 }
526 }, 532 },
527 533
@@ -719,10 +725,14 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
719 // Next, update this.layerRepetition.selectedIndexes and this.currentLayerSelected. 725 // Next, update this.layerRepetition.selectedIndexes and this.currentLayerSelected.
720 if (layerIndex !== false) { 726 if (layerIndex !== false) {
721 this.layerRepetition.selectedIndexes = [layerIndex]; 727 this.layerRepetition.selectedIndexes = [layerIndex];
722 this.currentLayerSelected = this.arrLayers[layerIndex] 728 this.trackRepetition.selectedIndexes = [layerIndex];
729 this.currentLayerSelected = this.arrLayers[layerIndex];
730 this.currentTrackSelected = this.arrTracks[layerIndex];
723 } else { 731 } else {
724 this.layerRepetition.selectedIndexes = null; 732 this.layerRepetition.selectedIndexes = null;
733 this.trackRepetition.selectedIndexes = null;
725 this.currentLayerSelected = null; 734 this.currentLayerSelected = null;
735 this.currentTrackSelected = null;
726 } 736 }
727 } 737 }
728 }, 738 },