Start enforcing one element per layer

Signed-off-by: Jonathan Duran <jduran@motorola.com>

2 files changed, 96 insertions, 39 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index a1e320c4..528d1fbf 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -68,7 +68,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         value: function() {
             if (this._boolCacheArrays) {
                 this.application.ninja.currentDocument.tlArrLayers = this.arrLayers;
-
             }
         }
     },
@@ -102,6 +101,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         }
     },
 
+    // TODO - Remove hash tables
     _hashKey:{
             value:0
         },
@@ -126,6 +126,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         }
     },
 
+
     _currentLayerSelected:{
         value: null
     },
@@ -156,7 +157,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                         var selectIndex = this.getLayerIndexByID(newVal);
                         this._selectedLayerID = newVal;
                                 this._captureSelection = true;
-                                this.selectLayer(selectIndex, true);
+                                this.selectLayer(selectIndex);
                 }
         }
     },
@@ -226,17 +227,17 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 
     _breadCrumbContainer:{
             value:null
-            },
+    },
 
     breadCrumbContainer: {
+        get: function() {
+            return this._breadCrumbContainer;
+        },
         set: function(value) {
             if(this._breadCrumbContainer !== value) {
                 this._breadCrumbContainer = value;
                 this.LayerBinding(this.application.ninja.currentSelectedContainer);
             }
-        },
-        get: function() {
-            return this._breadCrumbContainer;
         }
     },
 
@@ -346,10 +347,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         value: function() {
             this.layout_tracks = this.element.querySelector(".layout-tracks");
             this.layout_markers = this.element.querySelector(".layout_markers");
-            this.newlayer_button.identifier = "addLayer";
-            this.newlayer_button.addEventListener("click", this, false);
-            this.deletelayer_button.identifier = "deleteLayer";
-            this.deletelayer_button.addEventListener("click", this, false);
+
+            //this.newlayer_button.identifier = "addLayer";
+            //this.newlayer_button.addEventListener("click", this, false);
+            //this.deletelayer_button.identifier = "deleteLayer";
+            //this.deletelayer_button.addEventListener("click", this, false);
+
             this.timeline_leftpane.addEventListener("click", this.timelineLeftPaneClick.bind(this), false);
             this.layout_tracks.addEventListener("scroll", this.updateLayerScroll.bind(this), false);
             this.user_layers.addEventListener("scroll", this.updateLayerScroll.bind(this), false);
@@ -374,8 +377,13 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 this.application.ninja.currentDocument.isTimelineInitialized = true;
                 this.application.ninja.currentDocument.tlArrLayers = [];
                 this.application.ninja.currentDocument.tllayerNumber = 0;
+
+                // TODO - Remove hash
                 this.application.ninja.currentDocument.tlLayerHashTable=[];
+
                 this.temparrLayers = [];
+
+                // TODO - Remove hash
                 this.hashKey = this.application.ninja.currentSelectedContainer.uuid;
 
                 // Are we creating a new doc, or opening an existing one?
@@ -391,24 +399,26 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                         }
                     } else {
                         // No, it has no DOM elements. Build an empty layer object.
-                        this.restoreLayer(1);
+                        //this.restoreLayer(1);
                     }
                     
                     // Feed the new array of objects into the repetitions
                     // and select the first layer.
-                    this.temparrLayers[0].layerData.isSelected = true;
-                                        this.temparrLayers[0].layerData._isFirstDraw = true;
+                    //this.temparrLayers[0].layerData.isSelected = true;
+                                        //this.temparrLayers[0].layerData._isFirstDraw = true;
                                         
                     this.arrLayers=this.temparrLayers;
 
                 } else {
                         // New document. Create default layer.
-                    this.createNewLayer(1);
+                    //this.createNewLayer(1);
                 }
                 
                 // 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;
@@ -427,6 +437,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;
+
+                // TODO - remove hash
                 this.hashInstance = this.application.ninja.currentDocument.tlLayerHashTable;
                 this.hashElementMapToLayer = this.application.ninja.currentDocument.tlElementHashTable;
                 this.hashKey = this.application.ninja.currentDocument.hashKey;
@@ -452,8 +464,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this.timebar.style.width = "0px";
             
             // Clear variables.
-            this.hashInstance = null;
-            this.hashElementMapToLayer = null;
+            this.hashInstance = null;  // TODO - remove hash
+            this.hashElementMapToLayer = null;  // TODO - remove hash
             this.currentLayerNumber = 0;
             this.currentLayerSelected = false;
             this.selectedKeyframes = [];
@@ -481,7 +493,8 @@ 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();
             
@@ -541,8 +554,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         value:function(){
             var key , switchSelectedLayer,layerIndex;
             this.deselectTweens();
+
             if(this.application.ninja.selectedElements[0]){
+
+                // TODO - element uuid should be stored directly in layer array (possibly as the layerID)
                 key = this.application.ninja.selectedElements[0].uuid;
+
                 switchSelectedLayer = this.hashElementMapToLayer.getItem(key);
                 if(switchSelectedLayer!==undefined){