Merge branch 'refs/heads/SerialKiller' into TimelineUber

1 files changed, 300 insertions, 265 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 087bf3cd..28363398 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -19,24 +19,43 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 
     /* === BEGIN: Models === */
     _arrLayers:{
+        serializable: true,
         value:[]
     },
 
     arrLayers:{
+        serializable: true,
         get:function () {
             return this._arrLayers;
         },
         set:function (newVal) {
             this._arrLayers = newVal;
+            this.needsDraw = true;
             this._cacheArrays();
         }
     },
 
+    _temparrLayers:{
+        value:[]
+    },
+
+    temparrLayers:{
+        get:function () {
+            return this._temparrLayers;
+        },
+        set:function (newVal) {
+            this._temparrLayers = newVal;
+        }
+    },
+
+
     _layerRepetition:{
+        serializable: true,
         value:null
     },
 
     layerRepetition:{
+        serializable: true,
         get:function () {
             return this._layerRepetition;
         },
@@ -46,17 +65,17 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     },
 
     _cacheArrays : {
-        value: function() {
-                if (this._boolCacheArrays) {
-                                this.application.ninja.currentDocument.tlArrLayers = this.arrLayers;
+        value: function() {
+            if (this._boolCacheArrays) {
+                this.application.ninja.currentDocument.tlArrLayers = this.arrLayers;
 
-                }
-        }
+            }
+        }
     },
     
     // Set to false to skip array caching array sets in current document
     _boolCacheArrays : {
-        value: true
+        value: true
     },
 
     _currentLayerNumber:{
@@ -217,9 +236,10 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     prepareForDraw:{
         value:function () {
             this.initTimeline();
-            this.eventManager.addEventListener("onOpenDocument", this, false);
-            this.eventManager.addEventListener("closeDocument", this, false);
-            this.eventManager.addEventListener("switchDocument", this, false);
+            // Bind the event handler for the document change events
+                        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);
         }
     },
 
@@ -233,39 +253,66 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     },
     /* === END: Draw cycle === */
     /* === BEGIN: Controllers === */
-        // Bind all document-specific events (pass in true to unbind)
-        _bindDocumentEvents : {
-                value: function(boolUnbind) {
-                        var arrEvents = ["deleteLayerClick", 
-                                                         "newLayer", 
-                                                         "deleteLayer",
-                                                         "elementAdded", 
-                                                         "elementDeleted",
-                                                         "selectionChange"],
-                                i,
-                                arrEventsLength = arrEvents.length;
-                                
-                        if (boolUnbind) {
-                                for (i = 0; i < arrEventsLength; i++) {
-                                        this.eventManager.removeEventListener(arrEvents[i], this, false);
-                                }
-                        } else {
-                                for (i = 0; i < arrEventsLength; i++) {
-                                        this.eventManager.addEventListener(arrEvents[i], this, false);
-                                }
+        // Create an empty layer template object with minimal defaults and return it for use
+        createLayerTemplate : {
+                value : function() {
+                        var returnObj = {};
+                        returnObj.layerData = {};
+                        returnObj.layerData.layerName = null;
+            returnObj.layerData.layerID = null;
+            returnObj.layerData.isMainCollapsed = true;
+            returnObj.layerData.isPositionCollapsed = true;
+            returnObj.layerData.isTransformCollapsed = true;
+            returnObj.layerData.isStyleCollapsed = true;
+            returnObj.layerData.arrLayerStyles = [];
+            returnObj.layerData.elementsList = [];
+            returnObj.layerData.deleted = false;
+            returnObj.layerData.isSelected = false;
+            returnObj.layerData.layerPosition = null;
+            returnObj.layerData.created=false;
+            returnObj.layerData.isTrackAnimated = false;
+            returnObj.layerData.currentKeyframeRule = null;
+            returnObj.layerData.trackPosition = 0;
+            returnObj.layerData.arrStyleTracks = [];
+            returnObj.layerData.tweens = [];
+            returnObj.parentElementUUID = null;
+            returnObj.parentElement = null;
+                        return returnObj;
+                }
+        },
+    // Bind all document-specific events (pass in true to unbind)
+    _bindDocumentEvents : {
+        value: function(boolUnbind) {
+            var arrEvents = ["deleteLayerClick",
+                             "newLayer",
+                             "deleteLayer",
+                             "elementAdded",
+                             "elementDeleted",
+                             "selectionChange"],
+                i,
+                arrEventsLength = arrEvents.length;
+                
+            if (boolUnbind) {
+                for (i = 0; i < arrEventsLength; i++) {
+                    this.eventManager.removeEventListener(arrEvents[i], this, false);
+                }
+            } 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
                 });
-                        }
-                }
-        },
-        
-        initTimeline : {
-                value: function() {
-                        // Set up basic Timeline functions: event listeners, etc.  Things that only need to be run once.
-                        this.layout_tracks = this.element.querySelector(".layout-tracks");
+            }
+        }
+    },
+    
+    initTimeline : {
+        value: function() {
+            // Set up basic Timeline functions: event listeners, etc.  Things that only need to be run once.
+            this.layout_tracks = this.element.querySelector(".layout-tracks");
             this.layout_markers = this.element.querySelector(".layout_markers");
 
             this.newlayer_button.identifier = "addLayer";
@@ -276,123 +323,129 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this.layout_tracks.addEventListener("scroll", this.updateLayerScroll.bind(this), false);
             this.user_layers.addEventListener("scroll", this.updateLayerScroll.bind(this), false);
             this.end_hottext.addEventListener("changing", this.updateTrackContainerWidth.bind(this), false);
-                        
-                }
-        },
-        
+            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);
+        }
+    },
+    
     initTimelineForDocument:{