1 files changed, 322 insertions, 177 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 52b63376..48537cef 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -114,27 +114,21 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         value: false
     },
 
-    _isLayerAdded:{
-        value:false
-    },
-
-    addButtonClicked:{
-        value:true
+    _firstTimeLoaded:{
+        value:true,
+        writable:true
     },
 
-    _firstLayerDraw:{
-        value:false,
+    _arrLayersNonEmpty:{
+        value:true,
         writable:true
     },
 
     willDraw: {
         value: function() {
             if (this._isLayer) {
-                this.addButtonClicked=false;
-                this._isElementAdded=true;
-                NJevent('newLayer',this)
-                this._isLayer = false;
-                this.addButtonClicked=true;
+                this.insertLayer();
+                this._isLayer = false;;
             }
         }
     },
@@ -204,7 +198,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             //event.stopPropagation();
             this._isLayer = true;
             this.needsDraw = true;
-
         }
     },
 
@@ -215,7 +208,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             if(this.application.ninja.currentSelectedContainer.id==="UserContent"){
                 this._hashKey="123";
             }
-            NJevent('deleteLayer')
+            this.removeLayer();
         }
     },
 
@@ -223,23 +216,28 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         value:function(event){
              var i=0;
              this.currentParentNode=this.application.ninja.currentSelectedContainer.parentNode;
-             this.removeLayerFromParentUUid = this.application.ninja.currentSelectedContainer.parentNode.uuid;
-             this.currentElement= event.detail.element;
-
-//             if(this._firstLayerDraw===false){
-//                 while(this.arrLayers.pop()){
-//                 }
-//                 while(this.arrTracks.pop()){
-//                 }
-//             }
-
-             this._hashKey = event.detail.element.uuid;
-             if(this.returnedObject = this.hashInstance.getItem(this._hashKey)){
-                this.returnedTrack = this.hashTrackInstance.getItem(this._hashKey);
-                this._hashFind = true;
-                NJevent('newLayer');
 
-            }
+             if(this._firstTimeLoaded){
+                     this._firstTimeLoaded=false;
+             }else{
+                     while(this.arrLayers.pop()){
+                     }
+                     while(this.arrTracks.pop()){
+                     }
+
+                     if(event.detail.element.id==="UserContent"){
+                         this._hashKey= "123";
+                     }else{
+                         this._hashKey = event.detail.element.uuid;
+                     }
+
+                     if(this.returnedObject = this.hashInstance.getItem(this._hashKey)){
+                        this.returnedTrack = this.hashTrackInstance.getItem(this._hashKey);
+                        this._hashFind = true;
+                     }
+                     NJevent('newLayer',event.detail);
+
+             }
 
         }
     },
@@ -276,6 +274,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             // Or at the end, if no layer is selected.
              var hashIndex =0 ,hashVariable=0,layerResult,trackResult,layerObject,trackObject,dLayer,parentNode;
 
+             this._arrLayersNonEmpty= true;
              if(this._hashFind){
                 while(layerResult = this.returnedObject[hashIndex]){
                     trackResult=this.returnedTrack[hashIndex];
@@ -288,40 +287,52 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
              this._hashFind=false;
              return;
              }
+             if(event.detail._undoStatus){
+                        if(this.application.ninja.currentSelectedContainer.id==="UserContent" && event.detail._el.parentElementUUID===123 ){
+                                dLayer=this.hashInstance.getItem(event.detail._el.parentElementUUID);
+                                while(dLayer[hashVariable]){
+                                     if(dLayer[hashVariable]._layerID === event.detail._el._layerID){
+                                         dLayer[hashVariable].deleted=false;
+                                         this.arrLayers.splice(event.detail._layerPosition,1,event.detail._el);
+                                         this.arrTracks.splice(event.detail._layerPosition,1,event.detail._track);
+                                         break;
+
+                                                }
+                                     hashVariable++;
+                                }
 
+                                }
+
+                        else if(event.detail._el.parentElementUUID!==this.application.ninja.currentSelectedContainer.uuid){
+                                dLayer=this.hashInstance.getItem(event.detail._el.parentElementUUID);
+                                while(dLayer[hashVariable]){
+                                    if(dLayer[hashVariable]._layerID===event.detail._el._layerID){
+                                        dLayer[hashVariable].deleted=false;
+                                        parentNode=dLayer[hashVariable].parentElement;
+                                        break;
+                                    }
+                                    hashVariable++;
+                                }
+                                this._setBreadCrumb=true;
+                                NJevent('breadCrumbTrail',{"element":parentNode,"setFlag":this._setBreadCrumb});
+                          }else{
+                                dLayer=this.hashInstance.getItem(event.detail._el.parentElementUUID);
+                                while(dLayer[hashVariable]){
+                                     if(dLayer[hashVariable]._layerID === event.detail._el._layerID){
+                                         dLayer[hashVariable].deleted=false;
+                                         this.arrLayers.splice(event.detail._layerPosition,1,event.detail._el);
+                                         this.arrTracks.splice(event.detail._layerPosition,1,event.detail._track);
+                                         break;
+
+                                    }
+                                    hashVariable++;
+                                }
+                            }
+             }
 
-//                if(this.addButtonClicked){
-//                    layerObject = this.hashInstance.getItem(this.application.ninja.currentSelectedContainer.uuid);
-//                    trackObject = this.hashTrackInstance.getItem(this.application.ninja.currentSelectedContainer.uuid);
-//                    if(layerObject!==undefined){
-//                            while(layerObject[hashVariable]){
-//                                if(event.detail.parentElement!==this.application.ninja.currentSelectedContainer){
-//                                    dLayer=this.hashInstance.getItem(event.detail.parentNode.uuid);
-//                                        while(dLayer[hashVariable]){
-//                                            if(dLayer[hashVariable].element===event.detail){
-//                                                dLayer[hashVariable].deleted=true;
-//                                                parentNode=dLayer[hashVariable].parentElement;
-//                                                break;
-//                                            }
-//                                            hashVariable++;
-//                                        }
-//                                        this._setBreadCrumb=true;
-//                                        NJevent('breadCrumbTrail',{"element":parentNode,"setFlag":this._setBreadCrumb});
-//
-//                                }
-//                                else if(layerObject[hashVariable].element===event.detail){
-//                                    this.arrLayers.splice(layerObject[hashVariable].layerPosition,0,layerObject[hashVariable]);
-//                                    this.arrTracks.splice(trackObject[hashVariable].trackPosition,0,trackObject[hashVariable]);
-//                                    this._isLayerAdded=true;
-//                                    break;
-//                                }
-//                                hashVariable++;
-//                                this._isLayerAdded=false;
-//                            }
-//                    }
-//                }
 
 
+            else{
                       var newLayerName = "",
                         //thingToPush = Layer.create(),