2 files changed, 175 insertions, 78 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 1aa9a725..92adee05 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -32,8 +32,7 @@
                         "timetext" : {"#": "time_text"},
                         "timebar" : {"#": "time_bar"},
                         "container_tracks" : {"#" : "container-tracks"},
-                        "end_hottext" : {"@" : "endHottext"},
-                        "getme" : {"#" : "getme"}
+                        "end_hottext" : {"@" : "endHottext"}
                     }
                 },
 
@@ -285,7 +284,7 @@
                         
                         <div id="user_layers" class="userlayers">
                             <div id="master_layer" class="masterlayer">
-                                <div id="getme">Master Layer</div>
+                                <div>Master Layer</div>
                             </div>
                             <div id="container-layers">
                                 <div id="container-layer"></div>
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index e92c83db..59306705 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -28,7 +28,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         },
         set:function (newVal) {
             this._arrLayers = newVal;
-            this.application.ninja.currentDocument.tlArrLayers = newVal;
+            this._cacheArrays();
         }
     },
 
@@ -44,6 +44,22 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this._layerRepetition = newVal;
         }
     },
+    _cacheArrays : {
+        value: function() {
+                // Cache this.arrLayers and this.arrTracks.
+                this.log('cacheArrays ' + this._boolCacheArrays)
+                if (this._boolCacheArrays) {
+                        this.log('caching arrays for ', this.application.ninja.currentDocument.name);
+                                this.application.ninja.currentDocument.tlArrLayers = this.arrLayers;
+                                this.application.ninja.currentDocument.tlArrTracks = this.arrTracks;
+                }
+        }
+    },
+    
+    // Set to false to skip array caching array sets in current document
+    _boolCacheArrays : {
+        value: true
+    },
 
     _currentLayerNumber:{
         value:0
@@ -100,7 +116,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         },
         set:function (newVal) {
             this._arrTracks = newVal;
-            this.application.ninja.currentDocument.tlArrTracks = newVal;
+            this._cacheArrays();
         }
     },
 
@@ -180,39 +196,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             }
         },
 
-    handleOnOpenDocument:{
-        value:function(){
-                this.clearTimelinePanel();
-            this.eventManager.addEventListener("deleteLayerClick", this, false);
-            this.eventManager.addEventListener("newLayer", this, false);
-            this.eventManager.addEventListener("deleteLayer", this, false);
-            this.eventManager.addEventListener("layerBinding", this, false);
-            this.eventManager.addEventListener("elementAdded", this, false);
-            this.eventManager.addEventListener("elementDeleted", this, false);
-            this.eventManager.addEventListener("deleteSelection", this, false);
-            this.eventManager.addEventListener("selectionChange", this, true);
-            this.hashInstance = this.createLayerHashTable();
-            this.hashTrackInstance = this.createTrackHashTable();
-            this.hashLayerNumber = this.createLayerNumberHash();
-            this.hashElementMapToLayer = this.createElementMapToLayer();
-            this.initTimelineView();
-
-
-        }
-    },
-    
-    handleCloseDocument: {
-        value: function(event) {
-                this.clearTimelinePanel();
-        }
-    },
-    
-    handleSwitchDocument : {
-        value: function(event) {
-                // Handle document change.
-                this.handleOnOpenDocument();
-        }
-    },
     
     willDraw:{
         value:function () {
@@ -225,6 +208,33 @@ 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", 
+                                                         "layerBinding",
+                                                         "elementAdded", 
+                                                         "elementDeleted", 
+                                                         "deleteSelection", 
+                                                         "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);
+                                }
+                        }
+                }
+        },
+        
         initTimeline : {
                 value: function() {
                         // Set up basic Timeline functions: event listeners, etc.  Things that only need to be run once.
@@ -242,49 +252,76 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                         
                 }
         },
-    initTimelineView:{
+        
+    initTimelineForDocument:{
         value:function () {
             var myIndex;
-                        
                         this.drawTimeMarkers();
+                        this._hashKey = "123";
+            
+            
+            // Document switching
+                        // Check to see if we have saved timeline information in the currentDocument.
+                        if (typeof(this.application.ninja.currentDocument.isTimelineInitialized) === "undefined") {
+                                // No, we have no information stored.  Create it.
+                                this.log('newfile ' + this.application.ninja.currentDocument.name)
+                                this.application.ninja.currentDocument.isTimelineInitialized = true;
+                                this.application.ninja.currentDocument.tlArrLayers = [];
+                                this.application.ninja.currentDocument.tlArrTracks = [];
+                                
+                                
+                                // Loop through the DOM of the document to find layers and animations.
+                                // Fire off events as they are found.
+                                _firstLayerDraw = false;
+                    if(!this.application.ninja.documentController.creatingNewFile){
+                        if(this.application.ninja.currentDocument.documentRoot.children[0]){
+                            myIndex=0;
+                            while(this.application.ninja.currentDocument.documentRoot.children[myIndex])
+                            {
+                                this._openDoc=true;
+                                NJevent('newLayer',{key:this._hashKey,ele:this.application.ninja.currentDocument.documentRoot.children[myIndex]})
+                                myIndex++;
+                                                }
+                        }
+                        else{
+                            NJevent('newLayer', this._hashKey);
+                            this.selectLayer(0);
+                        }
+                    }else{
+                        NJevent('newLayer', this._hashKey);
+                        this.selectLayer(0);
+        
+                    }
+                    _firstLayerDraw = true;
+