Merge branch 'refs/heads/timeline-local' into TimelineUber

2 files changed, 41 insertions, 34 deletions

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 36c77018..1b8d73c0 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -113,7 +113,18 @@ var Layer = exports.Layer = Montage.create(Component, {
                 this.layerData.layerTag = newVal;
         }
     },
-    
+    _docUUID : {
+        value: null
+    },
+    docUUID : {
+        serializable: true,
+        get: function() {
+                return this._docUUID;
+        },
+        set: function(newVal) {
+                this._docUUID = newVal;
+        }
+    },
     /* Position and Transform hottext values */
     _dtextPositionX : {
         value:null,
@@ -471,6 +482,7 @@ var Layer = exports.Layer = Montage.create(Component, {
             this.layerTag = this.layerData.layerTag;
             this.isVisible = this.layerData.isVisible;
             this.isAnimated = this.layerData.isAnimated;
+            this.docUUID = this.layerData.docUUID;
             this.needsDraw = boolNeedsDraw;
         }
     },
@@ -555,10 +567,15 @@ var Layer = exports.Layer = Montage.create(Component, {
     },
     didDraw: {
         value: function() {
-                if ((this.isSelected === true) && (this._isFirstDraw === true)) {
-                        // Once we're done drawing the first time we need to tell the TimelinePanel if
-                        // this layer is supposed to be selected.
-                        this.parentComponent.parentComponent.selectedLayerID = this.layerID;
+                if (this._isFirstDraw === true) {
+                        if (this.isSelected === true) {
+                                if (this.application.ninja.currentDocument._uuid === this._docUUID) {
+                                        // Once we're done drawing the first time we need to tell the TimelinePanel if
+                                        // this layer is supposed to be selected.
+                                        //console.log('layerName ' +  this.layerName);
+                                        this.parentComponent.parentComponent.selectedLayerID = this.layerID;
+                                        }
+                        }
                         this._isFirstDraw = false;
                 }
         }
@@ -567,36 +584,16 @@ var Layer = exports.Layer = Montage.create(Component, {
         
         /* Begin: Controllers */
         
-        // Initialize a just-created layer with some basic defaults and needed selectors.
+        // Initialize a just-created layer
         init: {
                 value: function() {
-                        // Default some vars
-                        //this.arrLayerStyles = [];
-                        
                         // Get some selectors.
                 this.label = this.element.querySelector(".label-layer");
                 this.titleSelector = this.label.querySelector(".collapsible-label");
                 this.buttonAddStyle = this.element.querySelector(".button-add");
                 this.buttonDeleteStyle = this.element.querySelector(".button-delete");
-                
-                
-
                 }
         },
-    selectLayer:{
-        value:function(){
-            // this.mainCollapser.header.classList.add("layerSelected");
-            this.element.classList.add("layerSelected");
-            this.isSelected = true;
-        }
-    },
-    deselectLayer:{
-        value:function(){
-            // this.mainCollapser.header.classList.remove("layerSelected");
-            this.element.classList.remove("layerSelected");
-            this.isSelected = false;
-        }
-    },
         addStyle : {
                 value: function() {
                         // Add a new style rule.  It should be added above the currently selected rule, 
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 7fb57396..92c0766b 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -26,7 +26,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             return this._arrLayers;
         },
         set:function (newVal) {
-//            debugger;
             this._arrLayers = newVal;
             this.needsDraw = true;
             this.cacheTimeline();
@@ -113,7 +112,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 var selectIndex = this.getLayerIndexByID(newVal);
                 this._selectedLayerID = newVal;
                 this._captureSelection = true;
-                this.selectLayer(selectIndex);
+                this.selectLayer(selectIndex, true);
             }
         }
     },
@@ -384,6 +383,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             returnObj.layerData.tweens = [];
             returnObj.layerData.layerTag = "";
             returnObj.layerData.isVisible = true;
+            returnObj.layerData.docUUID = this.application.ninja.currentDocument._uuid;
             returnObj.layerData.isTrackAnimated = false;
             returnObj.parentElementUUID = null;
             returnObj.parentElement = null;
@@ -502,7 +502,10 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this.playhead.addEventListener("mousedown", this.startPlayheadTracking.bind(this), false);
             this.playhead.addEventListener("mouseup", this.stopPlayheadTracking.bind(this), false);
             this.time_markers.addEventListener("click", this.updatePlayhead.bind(this), false);
-
+            
+            // Initialize BreadCrumb 
+            this.application.ninja.breadCrumbClick = false;
+            this.enablePanel(false);
 
         }
     },
@@ -519,6 +522,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this.drawTimeMarkers();
             // Document switching
             // Check to see if we have saved timeline information in the currentDocument.
+                //debugger;
             if ((typeof(this.application.ninja.currentDocument.isTimelineInitialized) === "undefined") &&
                 (!this.application.ninja.currentDocument.breadCrumbClick)) {
                 //console.log('TimelinePanel.initTimelineForDocument: new Document');
@@ -575,7 +579,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 
                 // We're reading from the cache, not writing to it.
                 this._boolCacheArrays = false;
-
                 for (i = 0; i < tlArrLayersLength; i++) {
                     if (this.application.ninja.currentDocument.tlArrLayers[i].layerData.isSelected === true) {
                         this.application.ninja.currentDocument.tlArrLayers[i].layerData._isFirstDraw = true;
@@ -646,6 +649,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             // Clear the timeline but not the cache
             //console.log('TimelinePanel.handleDocumentChange');
             if ((event.type === "closeDocument") && (this.application.ninja.documentController._documents.length > 0)) {
+                // Ignore extra closeDocument event that fires while there are still documents open.
                 return;
             }
             this._boolCacheArrays = false;
@@ -668,9 +672,16 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 
     handleBreadCrumbBinding:{
         value:function(event){
-
-            if((typeof(this.application.ninja.currentDocument.isTimelineInitialized) === "undefined"))
-               return;
+                // Might fire if currentDocument has not yet been initialized.
+                        if (this.application.ninja.currentDocument == null) {
+                                return;
+                        }
+                        // Might fire if currentDocument is initialized but cache has not been initialized
+            if(typeof(this.application.ninja.currentDocument.isTimelineInitialized) === "undefined") {
+                return;
+            }
+            
+            // If the breadCrumb has been clicked, we need to change documents.
             if(this.application.ninja.currentDocument.breadCrumbClick){
                 this.handleDocumentChange(event);
             }
@@ -1031,7 +1042,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 
             this.layerRepetition.selectedIndexes = [layerIndex];