9 files changed, 170 insertions, 97 deletions

diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
index 66f39b5a..c18d6eff 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -16,8 +16,8 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
     prepareForDraw:{
         value:function(){
             this.element.addEventListener("click", this, false);
-            this.trackID = this.parentComponent.parentComponent.parentComponent.trackID;
-            this.animatedElement = this.parentComponent.parentComponent.parentComponent.animatedElement;
+            this.trackID = this.parentComponent.parentComponent.parentComponent.parentComponent.trackID;
+            this.animatedElement = this.parentComponent.parentComponent.parentComponent.parentComponent.animatedElement;
             this.ninjaStylesContoller = this.application.ninja.stylesController;
         }
     },
@@ -465,11 +465,9 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
             if (currentStyleValue == null) {
                 currentStyleValue = "1px";
             }
-            console.log(currentStyleValue);
 
             this.propTweens[0].tweenData.tweenedProperties[this.trackEditorProperty] = currentStyleValue;
 
-
             this.animationName = this.animatedElement.classList[0] + "_" + this.trackEditorProperty;
             var currentAnimationNameString = this.parentComponent.parentComponent.parentComponent.animationNamesString;
             var newAnimationNames = currentAnimationNameString + "," + this.animationName;
@@ -486,9 +484,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
             this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-iteration-count", newIterationCount);
 
             var initRule = "@-webkit-keyframes " + this.animationName + " { 0% {" + this.trackEditorProperty + ": " + currentStyleValue + ";} 100% {" + this.trackEditorProperty + ": " + currentStyleValue + ";} }";
-            console.log(initRule);
             this.currentKeyframeRule = this.ninjaStylesContoller.addRule(initRule);
-
             this.insertPropTween(tweenEvent.offsetX);
         }
     }
diff --git a/js/panels/Timeline/Span.reel/Span.js b/js/panels/Timeline/Span.reel/Span.js
index 91ce1cfb..3c491a53 100644
--- a/js/panels/Timeline/Span.reel/Span.js
+++ b/js/panels/Timeline/Span.reel/Span.js
@@ -71,6 +71,8 @@ var Span = exports.Span = Montage.create(Component, {
                                 newVal = "none";
                         }
                         this._easing = newVal;
+                        this.parentComponent.easing = this.easing;
+                        this.parentComponent.tweenData.easing = this.easing;
                         this.parentComponent.setKeyframeEase(newVal);
                         this.needsDraw = true;
                 }
@@ -180,7 +182,7 @@ var Span = exports.Span = Montage.create(Component, {
     handleEasingChoicesClick: {
         value: function(event) {
                 event.stopPropagation();
-                        
+
                         // Remove the pointer to ourselves
                         //this.application.ninja.timeline.currentOpenSpanMenu = false;
                         
@@ -190,6 +192,8 @@ var Span = exports.Span = Montage.create(Component, {
                 
                 // Set the easing 
                 this.easing = event.target.dataset.ninjaEase;
+                this.parentComponent.easing = this.easing;
+                this.parentComponent.tweenData.easing = this.easing;
                 
                 // Unbind the event handler
                 this.application.ninja.timeline.easingMenu.popup.contentEl.removeEventListener("click");
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 1c023fdb..470062ba 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -117,28 +117,42 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             if (value === this._currentDocument) {
                 return;
             }
-
-            if(!this._currentDocument && value.currentView === "design") {
-                this.enablePanel(true);
-            }
-
             this._currentDocument = value;
+            
+            var boolDoc = false,
+                boolView = false;
+                
+                        // Should we enable the panel? 
+                        // Only if we have both a document and we're in design view.
+                        if (typeof(value) !== "undefined") {
+                                if (value.currentView === "design") {
+                                        // We are in design view.
+                                        boolView = true;
+                                }
+                        }
+                        if (typeof(this._currentDocument) !== "undefined") {
+                                // We have a document, or at least we have initialized the panel.  
+                                boolDoc = true;
+                        }
 
-            if(!value) {
+            if(boolDoc === false) {
                 this._boolCacheArrays = false;
                 this.clearTimelinePanel();
                 this._boolCacheArrays = true;
                 this.enablePanel(false);
-            } else if(this._currentDocument.currentView === "design") {
-                this._boolCacheArrays = false;
-                this.clearTimelinePanel();
-                this._boolCacheArrays = true;
-
-                // Rebind the document events for the new document context
-                this._bindDocumentEvents();
-                
-                // Initialize the timeline for the document.
-                this.initTimelineForDocument();
+            } else {
+                if(boolView === true) {
+                        this._boolCacheArrays = false;
+                        this.clearTimelinePanel();
+                        this._boolCacheArrays = true;
+        
+                        // Rebind the document events for the new document context
+                        this._bindDocumentEvents();
+                        
+                        // Initialize the timeline for the document.
+                        this.initTimelineForDocument();
+                        this.enablePanel(true);
+                                }
             }
         }
     },
@@ -595,7 +609,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     prepareForDraw:{
         value:function () {
             this.initTimeline();
-
         }
     },
     
@@ -726,11 +739,27 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                         if (this._boolCacheArrays) {
                                 // ... but only if we're supposed to.
                 if(this.currentDocument) {
+                        var i = 0, 
+                                hashLength = this.application.ninja.currentDocument.tlBreadcrumbHash.length,
+                                boolHash = false;
+                                
                             this.application.ninja.currentDocument.tlArrLayers = this.arrLayers;
                             this.application.ninja.currentDocument.tlCurrentSelectedContainer = this.currentDocument.model.domContainer;
                             this.application.ninja.currentDocument.tllayerNumber = this.currentLayerNumber;
                             this.application.ninja.currentDocument.tlCurrentLayerSelected = this.currentLayerSelected;
                             this.application.ninja.currentDocument.tlCurrentLayersSelected = this.currentLayersSelected;
+                            for (i = 0; i < hashLength; i++ ) {
+                                if (this.application.ninja.currentDocument.tlBreadcrumbHash[i].containerUuid === this.currentDocument.model.domContainer.uuid) {
+                                        this.application.ninja.currentDocument.tlBreadcrumbHash[i].arrLayers = this.arrLayers;
+                                        boolHash = true;
+                                }
+                            }
+                            if (boolHash === false) {
+                                    var newHash = {};
+                                    newHash.containerUuid = this.currentDocument.model.domContainer.uuid;
+                                    newHash.arrLayers = this.arrLayers;
+                                    this.application.ninja.currentDocument.tlBreadcrumbHash.push(newHash);
+                            }
                 }
                         this.application.ninja.currentDocument.tlCurrentElementsSelected = this.currentElementsSelected;
                         }
@@ -748,6 +777,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 this.application.ninja.currentDocument.tlCurrentLayersSelected = false;