1 files changed, 141 insertions, 185 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 93fd170e..48181ae7 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -156,6 +156,22 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         }
     },
 
+    _breadCrumbContainer:{
+            value:null
+            },
+
+    breadCrumbContainer: {
+        set: function(value) {
+            if(this._breadCrumbContainer !== value) {
+                this._breadCrumbContainer = value;
+                this.LayerBinding(this.application.ninja.currentSelectedContainer);
+            }
+        },
+        get: function() {
+            return this._breadCrumbContainer;
+        }
+    },
+
     _isLayer:{
         value:false
     },
@@ -221,6 +237,11 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                                 for (i = 0; i < arrEventsLength; i++) {
                                         this.eventManager.addEventListener(arrEvents[i], this, false);
                                 }
+                Object.defineBinding(this, "breadCrumbContainer", {
+                    boundObject: this.application.ninja,
+                    boundObjectPropertyPath:"currentSelectedContainer",
+                    oneway: true
+                });
                         }
                 }
         },
@@ -247,8 +268,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         value:function () {
             var myIndex;
                         this.drawTimeMarkers();
-                        this._hashKey = "123";
-            
+            this._hashKey = this.application.ninja.currentSelectedContainer.uuid;
             // Document switching
                         // Check to see if we have saved timeline information in the currentDocument.
                         if (typeof(this.application.ninja.currentDocument.isTimelineInitialized) === "undefined") {
@@ -268,16 +288,16 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                             while(this.application.ninja.currentDocument.documentRoot.children[myIndex])
                             {
                                 this._openDoc=true;
-                                NJevent('newLayer',{key:this._hashKey,ele:this.application.ninja.currentDocument.documentRoot.children[myIndex]})
+                            this.restoreLayer(this.application.ninja.currentDocument.documentRoot.children[myIndex]);
                                 myIndex++;
                                                 }
                         }
                         else{
-                            NJevent('newLayer', this._hashKey);
+                        this.restoreLayer(1);
                             this.selectLayer(0);
                         }
                     }else{
-                        NJevent('newLayer', this._hashKey);
+                    this.createNewLayer(1);
                         this.selectLayer(0);
         
                     }
@@ -332,6 +352,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 this.selectedTweens = [];
                 this._captureSelection = false;
                 this._openDoc = false;
+            this._firstTimeLoaded=true;
                 this.end_hottext.value = 25;
                 this.updateTrackContainerWidth();
         }
@@ -345,7 +366,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 this._bindDocumentEvents();
                 
             this.hashInstance = this.createLayerHashTable();
-            this.hashTrackInstance = this.createTrackHashTable();
             this.hashLayerNumber = this.createLayerNumberHash();
             this.hashElementMapToLayer = this.createElementMapToLayer();
             this.initTimelineForDocument();
@@ -456,34 +476,26 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 // nothing is selected, do not delete
                 return;
             }
-            this._deleteKeyDown = false;
-            if (this.application.ninja.currentSelectedContainer.id === "UserContent") {
-                this._hashKey = "123";
-            }
             this.removeLayer();
         }
     },
 
-    handleLayerBinding:{
-        value:function (event) {
+    LayerBinding:{
+            value:function (node) {
             var i = 0;
+
             if (this._firstTimeLoaded) {
                 this._firstTimeLoaded = false;
             } else {
                 this.arrLayers.length = 0;
                 this.arrTracks.length = 0;
+                this._hashKey = node.uuid;
 
-                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;
                 }
                 this.currentLayerNumber = 0;
-                NJevent('newLayer', event.detail);
+                this.createNewLayer(1);
                 this.selectLayer(0);
             }
         }
@@ -499,44 +511,15 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         }
     },
 
-    handleNewLayer:{
-        value:function (event) {
-            var hashIndex = 0 , hashVariable = 0, layerResult, trackResult, layerObject, trackObject, dLayer, parentNode;
-            if (this._hashFind) {
-                while (layerResult = this.returnedObject[hashIndex]) {
-                    trackResult = this.returnedTrack[hashIndex];
-                    if (layerResult.deleted !== true) {
-                        
-                        // TODO: Help from Kruti
-                        this.arrTracks.push(trackResult);
-                        this.arrLayers.push(layerResult);
-
-                    }
-                    hashIndex++;
-                }
-                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;
-                            
-                            // TODO: Help from Kruti
-                            this.arrTracks.splice(event.detail._layerPosition, 0, event.detail._track);
-                            this.arrLayers.splice(event.detail._layerPosition, 0, event.detail._el);
-                            this.selectLayer(event.detail._layerPosition);
-                            break;
+    createNewLayer:{
+        value:function(object){
+            var hashVariable = 0;
 
-                        }
-                        hashVariable++;
-                    }
-                } else if (event.detail._el.parentElementUUID !== this.application.ninja.currentSelectedContainer.uuid) {
-                    dLayer = this.hashInstance.getItem(event.detail._el.parentElementUUID);
+            if (object._undoStatus) {
+                if (object._el.parentElementUUID !== this.application.ninja.currentSelectedContainer.uuid) {
+                    dLayer = this.hashInstance.getItem(object._el.parentElementUUID);
                     while (dLayer[hashVariable]) {
-                        if (dLayer[hashVariable]._layerID === event.detail._el._layerID) {
+                        if (dLayer[hashVariable]._layerID === object._el._layerID) {
                             dLayer[hashVariable].deleted = false;
                             parentNode = dLayer[hashVariable].parentElement;
                             break;
@@ -544,26 +527,97 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                         hashVariable++;