aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js33
1 files changed, 16 insertions, 17 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 93fd170e..2001c3fb 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -501,14 +501,14 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
501 501
502 handleNewLayer:{ 502 handleNewLayer:{
503 value:function (event) { 503 value:function (event) {
504 var hashIndex = 0 , hashVariable = 0, layerResult, trackResult, layerObject, trackObject, dLayer, parentNode; 504 var hashIndex = 0 , hashVariable = 0, layerResult, layerObject, trackObject, dLayer, parentNode;
505 if (this._hashFind) { 505 if (this._hashFind) {
506 while (layerResult = this.returnedObject[hashIndex]) { 506 while (layerResult = this.returnedObject[hashIndex]) {
507 trackResult = this.returnedTrack[hashIndex]; 507 // trackResult = this.returnedTrack[hashIndex];
508 if (layerResult.deleted !== true) { 508 if (layerResult.deleted !== true) {
509 509
510 // TODO: Help from Kruti 510
511 this.arrTracks.push(trackResult); 511 //this.arrTracks.push(trackResult);
512 this.arrLayers.push(layerResult); 512 this.arrLayers.push(layerResult);
513 513
514 } 514 }
@@ -524,8 +524,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
524 if (dLayer[hashVariable]._layerID === event.detail._el._layerID) { 524 if (dLayer[hashVariable]._layerID === event.detail._el._layerID) {
525 dLayer[hashVariable].deleted = false; 525 dLayer[hashVariable].deleted = false;
526 526
527 // TODO: Help from Kruti 527
528 this.arrTracks.splice(event.detail._layerPosition, 0, event.detail._track); 528 //this.arrTracks.splice(event.detail._layerPosition, 0, event.detail._track);
529 this.arrLayers.splice(event.detail._layerPosition, 0, event.detail._el); 529 this.arrLayers.splice(event.detail._layerPosition, 0, event.detail._el);
530 this.selectLayer(event.detail._layerPosition); 530 this.selectLayer(event.detail._layerPosition);
531 break; 531 break;
@@ -550,8 +550,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
550 if (dLayer[hashVariable]._layerID === event.detail._el._layerID) { 550 if (dLayer[hashVariable]._layerID === event.detail._el._layerID) {
551 dLayer[hashVariable].deleted = false; 551 dLayer[hashVariable].deleted = false;
552 552
553 // TODO: Help from Kruti 553
554 this.arrTracks.splice(event.detail._layerPosition, 0, event.detail._track); 554 //this.arrTracks.splice(event.detail._layerPosition, 0, event.detail._track);
555 this.arrLayers.splice(event.detail._layerPosition, 0, event.detail._el); 555 this.arrLayers.splice(event.detail._layerPosition, 0, event.detail._el);
556 this.selectLayer(event.detail._layerPosition); 556 this.selectLayer(event.detail._layerPosition);
557 break; 557 break;
@@ -624,18 +624,17 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
624 this.hashLayerNumber.setItem(this._hashKey, thingToPush); 624 this.hashLayerNumber.setItem(this._hashKey, thingToPush);
625 this.hashInstance.setItem(this._hashKey, thingToPush, myIndex); 625 this.hashInstance.setItem(this._hashKey, thingToPush, myIndex);
626 626
627 // TODO: Help from Kruti 627
628 this.hashTrackInstance.setItem(this._hashKey, newTrack, myIndex); 628 //this.hashTrackInstance.setItem(this._hashKey, newTrack, myIndex);
629 } else { 629 } else {
630 this.arrLayers.splice(0, 0, thingToPush); 630 this.arrLayers.splice(0, 0, thingToPush);
631 thingToPush.layerPosition = this.arrLayers.length - 1; 631 thingToPush.layerPosition = this.arrLayers.length - 1;
632 632
633 // TODO: Help from Kruti 633 //newTrack.trackPosition = this.arrTracks.length - 1;
634 newTrack.trackPosition = this.arrTracks.length - 1;
635 this._LayerUndoPosition = this.arrLayers.length - 1; 634 this._LayerUndoPosition = this.arrLayers.length - 1;
636 this.hashLayerNumber.setItem(this._hashKey, thingToPush); 635 this.hashLayerNumber.setItem(this._hashKey, thingToPush);
637 this.hashInstance.setItem(this._hashKey, thingToPush, thingToPush.layerPosition); 636 this.hashInstance.setItem(this._hashKey, thingToPush, thingToPush.layerPosition);
638 this.hashTrackInstance.setItem(this._hashKey, newTrack, newTrack.trackPosition); 637 //this.hashTrackInstance.setItem(this._hashKey, newTrack, newTrack.trackPosition);
639 this.selectLayer(0); 638 this.selectLayer(0);
640 639
641 } 640 }
@@ -727,8 +726,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
727 var myIndex = this.layerRepetition.selectedIndexes[0]; 726 var myIndex = this.layerRepetition.selectedIndexes[0];
728 this._LayerUndoObject = this.arrLayers[myIndex]; 727 this._LayerUndoObject = this.arrLayers[myIndex];
729 728
730 // TODO: Help from Kruti 729
731 this._TrackUndoObject = this.arrTracks[myIndex]; 730 //this._TrackUndoObject = this.arrTracks[myIndex];
732 731
733 dLayer = this.hashInstance.getItem(this._hashKey); 732 dLayer = this.hashInstance.getItem(this._hashKey);
734 dTrack = this.hashTrackInstance.getItem(this._hashKey); 733 dTrack = this.hashTrackInstance.getItem(this._hashKey);
@@ -756,8 +755,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
756 this._LayerUndoObject = this.arrLayers.pop(); 755 this._LayerUndoObject = this.arrLayers.pop();
757 this._LayerUndoIndex = this._LayerUndoObject.layerID; 756 this._LayerUndoIndex = this._LayerUndoObject.layerID;
758 757
759 // TODO: Help from Kruti 758
760 this._TrackUndoObject = this.arrTracks.pop(); 759 //this._TrackUndoObject = this.arrTracks.pop();
761 } 760 }
762 } 761 }
763 } 762 }