2 files changed, 67 insertions, 11 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 0fd5b05d..92adee05 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -115,6 +115,41 @@
                                         "boundObject" : {"@" : "repetition1"},
                                         "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed",
                                         "oneway" : false
+                                },
+                                "dtextPositionX" : {
+                                        "boundObject" : {"@" : "repetition1"},
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextPositionX",
+                                        "oneway" : false
+                                },
+                                "dtextPositionY" : {
+                                        "boundObject" : {"@" : "repetition1"},
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextPositionY",
+                                        "oneway" : false
+                                },
+                                "dtextSkewX" : {
+                                        "boundObject" : {"@" : "repetition1"},
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextSkewX",
+                                        "oneway" : false
+                                },
+                                "dtextSkewY" : {
+                                        "boundObject" : {"@" : "repetition1"},
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextSkewY",
+                                        "oneway" : false
+                                },
+                                "dtextScaleX" : {
+                                        "boundObject" : {"@" : "repetition1"},
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextScaleX",
+                                        "oneway" : false
+                                },
+                                "dtextScaleY" : {
+                                        "boundObject" : {"@" : "repetition1"},
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextScaleY",
+                                        "oneway" : false
+                                },
+                                "dtextRotate" : {
+                                        "boundObject" : {"@" : "repetition1"},
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextRotate",
+                                        "oneway" : false
                                 }
                         }
                     },
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index a5cde00f..797a7cbf 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -230,8 +230,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 {
                     this._openDoc=true;
                     NJevent('newLayer',{key:this._hashKey,ele:this.application.ninja.currentDocument.documentRoot.children[myIndex]})
-//                    this.selectLayer(myIndex);
-//                    TimelineTrack.retrieveStoredTweens();
                     myIndex++;
                 }
             }else{
@@ -242,6 +240,24 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             _firstLayerDraw = true;
         }
     },
+    
+    clearTimelinePanel : {
+        value: function() {
+                console.log('clearing timeline...')
+                this.arrTracks = null;
+                this.arrLayers = null;
+                this.currentLayerNumber = 0;
+                this.currentLayerSelected = null;
+                this.currentTrackSelected = null;
+                this.selectedKeyframes = [];
+                this.selectedTweens = [];
+                this._captureSelection = false;
+                this._openDoc = false;
+                this.end_hottext.value = 25;
+                this.updateTrackContainerWidth();
+                this.needsDraw = true;
+        }
+    },
 
     updateTrackContainerWidth:{
         value: function(){
@@ -318,6 +334,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         value:function (event) {
             this._isLayer = true;
             this.needsDraw = true;
+            this.application.ninja.selectionController.executeSelectElement();
         }
     },
 
@@ -469,7 +486,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 if(this._openDoc){
                     event.detail.ele.uuid =nj.generateRandom();
                     thingToPush.elementsList.push(event.detail.ele);
-                    this._openDoc=false;
                 }
 
                 newTrack.trackID = this.currentLayerNumber;
@@ -499,7 +515,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                     this.arrTracks.splice(myIndex, 0, newTrack);
                     this.arrLayers.splice(myIndex, 0, thingToPush);
                     this._LayerUndoPosition = myIndex;
-//                    this.selectLayer(myIndex);
+                    this.selectLayer(myIndex);
                     this.hashLayerNumber.setItem(this._hashKey, thingToPush);
                     this.hashInstance.setItem(this._hashKey, thingToPush, myIndex);
                     this.hashTrackInstance.setItem(this._hashKey, newTrack, myIndex);
@@ -512,16 +528,19 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                     this.hashLayerNumber.setItem(this._hashKey, thingToPush);
                     this.hashInstance.setItem(this._hashKey, thingToPush, thingToPush.layerPosition);
                     this.hashTrackInstance.setItem(this._hashKey, newTrack, newTrack.trackPosition);
-//                    this.selectLayer(0);
+                    this.selectLayer(0);
+
+                }
 
+                if(this._openDoc){
+                    this.hashElementMapToLayer.setItem(event.detail.ele.uuid, event.detail.ele,this.currentLayerSelected);
+                    this._openDoc=false;
                 }
                 this._LayerUndoObject = thingToPush;
                 this._LayerUndoIndex = thingToPush.layerID;
                 this._LayerUndoStatus = true;
                 this._TrackUndoObject = newTrack;
-//                if(_firstLayerDraw){
-//                this.application.ninja.selectionController.executeSelectElement();
-//                }
+
 
             }
         }
@@ -716,6 +735,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                             }
                         }
                         hashLayerObject[key][index] = value;
+                        console.log(hashLayerObject)
                         this.counter = 0;
                     }
                 },
@@ -810,6 +830,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                           }
                           this.mappingArray[key]["ele"] = value;
                           this.mappingArray[key].layerID = layer.layerID;
+                              console.log(this.mappingArray)
 
                           }
                       },
@@ -846,9 +867,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 this.trackRepetition.selectedIndexes = [layerIndex];
                 this.currentLayerSelected = this.arrLayers[layerIndex];
                 this.currentTrackSelected = this.arrTracks[layerIndex];
-                /*if(this._captureSelection){
-                this.application.ninja.selectionController.selectElements(this.currentLayerSelected.elementsList)
-                }*/
+                if(this._captureSelection){
+                    this.application.ninja.selectionController.selectElements(this.currentLayerSelected.elementsList)
+                }
                 this._captureSelection = true;
             } else {
                 this.layerRepetition.selectedIndexes = null;