Timeline : Bug Fix : IKNINJA 1374

Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 32 insertions, 224 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 0ba49c44..bc474a46 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -68,6 +68,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         value:function () {
             if (this._boolCacheArrays) {
                 this.application.ninja.currentDocument.tlArrLayers = this.arrLayers;
+                this.application.ninja.currentDocument.tlCurrentSelectedContainer=this.application.ninja.currentSelectedContainer;
             }
         }
     },
@@ -101,32 +102,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         }
     },
 
-    // TODO - Remove hash tables
-    _hashKey:{
-        value:0
-    },
-
-    hashKey:{
-        get:function () {
-            return this._hashKey;
-        },
-        set:function (newVal) {
-            if (newVal !== this._hashKey) {
-                this._hashKey = newVal;
-                this._setHashKey();
-            }
-        }
-    },
-
-    _setHashKey:{
-        value:function () {
-            if (this._boolCacheArrays) {
-                this.application.ninja.currentDocument.hashKey = this.hashKey;
-            }
-        }
-    },
-
-
     _currentLayerSelected:{
         value:null
     },
@@ -236,7 +211,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         set:function (value) {
             if (this._breadCrumbContainer !== value) {
                 this._breadCrumbContainer = value;
-                this.LayerBinding(this.application.ninja.currentSelectedContainer);
+                this.LayerBinding();
             }
         }
     },
@@ -278,7 +253,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     willDraw:{
         value:function () {
             if (this._isLayer) {
-                this.insertLayer();
+              //  this.createNewLayer();
                 this._isLayer = false;
             }
         }
@@ -408,21 +383,25 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this.drawTimeMarkers();
             // Document switching
             // Check to see if we have saved timeline information in the currentDocument.
-            if (typeof(this.application.ninja.currentDocument.isTimelineInitialized) === "undefined") {
+            if (typeof(this.application.ninja.currentDocument.isTimelineInitialized) === "undefined" || this.application.ninja.breadCrumbClick) {
                 // No, we have no information stored.  Create it.
                 this.application.ninja.currentDocument.isTimelineInitialized = true;
                 this.application.ninja.currentDocument.tlArrLayers = [];
                 this.application.ninja.currentDocument.tllayerNumber = 0;
+                this.application.ninja.currentDocument.tlCurrentSelectedContainer = null;
                 this.temparrLayers = [];
 
-                // TODO - Remove hash
-                this.application.ninja.currentDocument.tlLayerHashTable = [];
-                this.hashKey = this.application.ninja.currentSelectedContainer.uuid;
-
                 // Are we opening an existing doc?
                 if (!this.application.ninja.documentController.creatingNewFile) {
                     // Opening an existing document. Does it have any DOM elements?
-                    if (this.application.ninja.currentDocument.documentRoot.children[0]) {
+                    if(this.application.ninja.breadCrumbClick){
+                        var parentNode = this.application.ninja.currentSelectedContainer;
+                        for (myIndex = 0; parentNode.children[myIndex]; myIndex++) {
+                            this._openDoc = true;
+                            this.restoreLayer(parentNode.children[myIndex]);
+                        }
+
+                    }else if (this.application.ninja.currentDocument.documentRoot.children[0]) {
                         // Yes, it has DOM elements. Loop through them and create a new object for each.
                         for (myIndex = 0; this.application.ninja.currentDocument.documentRoot.children[myIndex]; myIndex++) {
                             this._openDoc = true;
@@ -436,11 +415,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 // After recreating the tracks and layers, store the result in the currentDocument.
                 this.application.ninja.currentDocument.tlArrLayers = this.arrLayers;
                 this.application.ninja.currentDocument.tllayerNumber = this.currentLayerNumber;
-
-                // TODO - Remove both hashes?
-                this.application.ninja.currentDocument.tlLayerHashTable = this.hashInstance;
-                this.application.ninja.currentDocument.tlElementHashTable = this.hashElementMapToLayer;
-                this.application.ninja.currentDocument.hashKey = this.hashKey;
+                this.application.ninja.currentDocument.tlCurrentSelectedContainer=this.application.ninja.currentSelectedContainer;
 
             } else {
                 // we do have information stored.  Use it.
@@ -453,11 +428,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 this.arrLayers = this.application.ninja.currentDocument.tlArrLayers;
                 this.currentLayerNumber = this.application.ninja.currentDocument.tllayerNumber;
                 this.currentLayerSelected = this.application.ninja.currentDocument.tlCurrentLayerSelected;
+                this.application.ninja.currentSelectedContainer=this.application.ninja.currentDocument.tlCurrentSelectedContainer;
 
-                // TODO - remove hash
-                this.hashInstance = this.application.ninja.currentDocument.tlLayerHashTable;
-                this.hashElementMapToLayer = this.application.ninja.currentDocument.tlElementHashTable;
-                this.hashKey = this.application.ninja.currentDocument.hashKey;
             }
         }
     },
@@ -478,19 +450,15 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this.application.ninja.timeline.updateTimeText(0.00);
             this.timebar.style.width = "0px";
 
-            // Clear variables.
-            this.hashInstance = null;  // TODO - remove hash
-            this.hashElementMapToLayer = null;  // TODO - remove hash
             this.currentLayerNumber = 0;
             this.currentLayerSelected = false;
             this.selectedKeyframes = [];
             this.selectedTweens = [];
             this._captureSelection = false;
             this._openDoc = false;
-            this._firstTimeLoaded = true;
+//            this._firstTimeLoaded = true;
             this.end_hottext.value = 25;
             this.updateTrackContainerWidth();
-            this.selectedLayerID = false;
 
             // Clear the repetitions
             if (this.arrLayers.length > 0) {
@@ -510,14 +478,11 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             // Rebind the document events for the new document context
             this._bindDocumentEvents();
 
-            // TODO - remove hash
-            this.hashInstance = this.createLayerHashTable();
-            this.hashElementMapToLayer = this.createElementMapToLayer();
-
             // Reinitialize the timeline...but only if there are open documents.
             if (this.application.ninja.documentController._documents.length > 0) {
                 this.enablePanel(true);
                 this.initTimelineForDocument();
+
             } else {
                 this.enablePanel(false);
             }
@@ -597,22 +562,19 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         value:function (node) {
             var i = 0;
 
-            if (typeof(this.application.ninja.currentDocument.isTimelineInitialized) === "undefined") {
+            if (typeof(this.application.ninja.currentDocument.isTimelineInitialized) === "undefined" || (this.application.ninja.breadCrumbClick)) {
                 if (this._firstTimeLoaded) {
                     this._firstTimeLoaded = false;