Merge pull request #29 from ericmueller/integration

Integration

1 files changed, 46 insertions, 78 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 59306705..91277a63 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -44,14 +44,11 @@ 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;
                 }
         }
     },
@@ -80,10 +77,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         value: null
     },
 
-    currentTrackSelected:{
-        value: null
-    },
-
     millisecondsOffset:{
         value:1000
     },
@@ -181,22 +174,21 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         value:false,
         writable:true
     },
+
     timeMarkerHolder:{
         value: null
     },
     /* === END: Models === */
-
     /* === BEGIN: Draw cycle === */
     prepareForDraw:{
-            value:function () {
-                this.initTimeline();
-                this.eventManager.addEventListener("onOpenDocument", this, false);
-                this.eventManager.addEventListener("closeDocument", this, false);
-                this.eventManager.addEventListener("switchDocument", this, false);
-            }
-        },
+        value:function () {
+            this.initTimeline();
+            this.eventManager.addEventListener("onOpenDocument", this, false);
+            this.eventManager.addEventListener("closeDocument", this, false);
+            this.eventManager.addEventListener("switchDocument", this, false);
+        }
+    },
 
-    
     willDraw:{
         value:function () {
             if (this._isLayer) {
@@ -206,9 +198,7 @@ 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) {
@@ -259,7 +249,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                         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") {
@@ -300,7 +289,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                                 
                         } else {
                                 // we do have information stored.  Use it.
-                                this.log('oldfile ' + this.application.ninja.currentDocument.name)
                                 this._boolCacheArrays = false;
                                 this.arrLayers = [];
                                 this.arrTracks = [];
@@ -313,8 +301,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 this.layerRepetition.needsDraw = true;
                 this.trackRepetition.needsDraw = true;
                 this.needsDraw = true;
-
-
         }
     },
     
@@ -323,7 +309,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 // Remove events
                         this._bindDocumentEvents(true);
             
-            // Remove every event listener for every tween in TimelineTrack
+            // Remove every event listener for every selected tween in the timeline
             this.deselectTweens();
 
                 // Reset visual appearance
@@ -342,21 +328,17 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 
                 this.currentLayerNumber = 0;
                 this.currentLayerSelected = false;
-                this.currentTrackSelected = false;
                 this.selectedKeyframes = [];
                 this.selectedTweens = [];
                 this._captureSelection = false;
                 this._openDoc = false;
                 this.end_hottext.value = 25;
                 this.updateTrackContainerWidth();
-                
         }
     },
 
-
         handleOnOpenDocument:{
                 value:function(){
-                
                         this._boolCacheArrays = false;
                 this.clearTimelinePanel();
                 this._boolCacheArrays = true;
@@ -367,8 +349,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this.hashLayerNumber = this.createLayerNumberHash();
             this.hashElementMapToLayer = this.createElementMapToLayer();
             this.initTimelineForDocument();
-
-
         }
     },
     
@@ -393,7 +373,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             if (this.timeMarkerHolder) {
                 this.time_markers.removeChild(this.timeMarkerHolder);
             }
-            
             this.drawTimeMarkers();
         }
     },
@@ -405,9 +384,10 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         }
     },
 
-    captureSelectionChange:{
+    handleSelectionChange:{
         value:function(){
             var key , switchSelectedLayer,layerIndex;
+            this.deselectTweens();
             if(this.application.ninja.selectedElements[0]){
                 key = this.application.ninja.selectedElements[0].uuid;
                 switchSelectedLayer = this.hashElementMapToLayer.getItem(key);
@@ -416,7 +396,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                     this._captureSelection=false;
                     this.selectLayer(layerIndex);
                     this._captureSelection=true;
-