Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js

	Used mine.

2 files changed, 30 insertions, 65 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index eeb74625..0b688139 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -26,6 +26,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             return this._arrLayers;
         },
         set:function (newVal) {
+//            debugger;
             this._arrLayers = newVal;
             this.needsDraw = true;
             this.cacheTimeline();
@@ -136,16 +137,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         }
     },
 
-    tweenarray:{
-            value:[],
-            writable:true
-    },
-
-    tempArray:{
-        value:[],
-        writable:true
-    },
-
     _masterDuration:{
         serializable:true,
         value:0
@@ -205,22 +196,6 @@ 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();
-            }
-        }
-    },
-
     _isLayer:{
         value:false
     },
@@ -316,6 +291,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this.eventManager.addEventListener("onOpenDocument", this.handleDocumentChange.bind(this), false);
             this.eventManager.addEventListener("closeDocument", this.handleDocumentChange.bind(this), false);
             this.eventManager.addEventListener("switchDocument", this.handleDocumentChange.bind(this), false);
+            this.eventManager.addEventListener("breadCrumbBinding",this,false);
             
             // Bind drag and drop event handlers
             this.container_layers.addEventListener("dragstart", this.handleLayerDragStart.bind(this), false);
@@ -329,6 +305,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this.checkable_absolute.addEventListener("click", this.handleAbsoluteClick.bind(this), false);
             this.tl_configbutton.addEventListener("click", this.handleConfigButtonClick.bind(this), false);
             document.addEventListener("click", this.handleDocumentClick.bind(this), false);
+
         }
     },
 
@@ -425,9 +402,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                         if (this._boolCacheArrays) {
                                 // ... but only if we're supposed to.
                         this.application.ninja.currentDocument.tlArrLayers = this.arrLayers;
-                        this.application.ninja.currentDocument.tlCurrentSelectedContainer = this.currentSelectedContainer;
+                        this.application.ninja.currentDocument.tlCurrentSelectedContainer = this.application.ninja.currentSelectedContainer;
                         this.application.ninja.currentDocument.tllayerNumber = this.currentLayerNumber;
-                        this.application.ninja.currentDocument.tlCurrentLayerSelected = this.currentLayerSelected;      
+                        this.application.ninja.currentDocument.tlCurrentLayerSelected = this.currentLayerSelected;
                         }
         }
     },
@@ -505,19 +482,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 for (i = 0; i < arrEventsLength; i++) {
                     this.eventManager.removeEventListener(arrEvents[i], this, false);
                 }
-                if (this._bindingDescriptors !== null) {
-                        //console.log('Unbinding breadcrumbcontainer')
-                        Object.deleteBinding(this, "breadCrumbContainer");
-                }
+
             } else {
                 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
-                });
+
             }
         }
     },
@@ -547,13 +517,16 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     // Called when a document is opened (new or existing), or when documents are switched.
     initTimelineForDocument:{
         value:function () {
+            if(this.application.ninja.currentDocument.breadCrumbClick === undefined){
+                this.application.ninja.currentDocument.breadCrumbClick = false;
+            }
             var myIndex,
                 boolAlreadyInitialized = false;
             this.drawTimeMarkers();
             // Document switching
             // Check to see if we have saved timeline information in the currentDocument.
             if ((typeof(this.application.ninja.currentDocument.isTimelineInitialized) === "undefined") &&
-                (!this.application.ninja.breadCrumbClick)) {
+                (!this.application.ninja.currentDocument.breadCrumbClick)) {
                 //console.log('TimelinePanel.initTimelineForDocument: new Document');
                 // No, we have no information stored.
                 // This could mean we are creating a new file, OR are opening an existing file.
@@ -580,7 +553,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 this.currentLayerNumber = this.arrLayers.length;
                 boolAlreadyInitialized = true;
                 
-                        } else if (this.application.ninja.breadCrumbClick) {
+                        } else if (this.application.ninja.currentDocument.breadCrumbClick) {
                 //console.log('TimelinePanel.initTimelineForDocument: breadCrumbClick');
                                 // Information stored, but we're moving up or down in the breadcrumb.
                                 // Get the current selection and restore timeline info for its children.
@@ -590,16 +563,16 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 
                 for (myIndex = 0; parentNode.children[myIndex]; myIndex++) {
                     this._openDoc = true;
+                    this.application.ninja.currentDocument.breadCrumbClick = false;
                     this.restoreLayer(parentNode.children[myIndex]);
+
                 }
-                
+                this.application.ninja.currentDocument.breadCrumbClick = false;
                 // Draw the repetition.
                 this.arrLayers = this.temparrLayers;
                 this.currentLayerNumber = storedCurrentLayerNumber;
-                this.currentLayerSelected = this.application.ninja.currentSelectedContainer;
-                // this.application.ninja.breadCrumbClick = false;
                 boolAlreadyInitialized = true;
-                                
+
             } else {
                 //console.log('TimelinePanel.initTimelineForDocument: else fallback');
                 // we do have information stored.  Use it.
@@ -616,7 +589,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                         this.application.ninja.currentDocument.tlArrLayers[i].layerData._isFirstDraw = false;
                     }
                 }
-                
                 this.arrLayers = this.application.ninja.currentDocument.tlArrLayers;
                 this.currentLayerNumber = this.application.ninja.currentDocument.tllayerNumber;
                 this.currentLayerSelected = this.application.ninja.currentDocument.tlCurrentLayerSelected;
@@ -701,6 +673,17 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         }
     },