Bigfixes and cleanup from optimization

Signed-off-by: Jonathan Duran <jduran@motorola.com>

3 files changed, 6 insertions, 5 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 94d9daec..42f68268 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -276,7 +276,6 @@ 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);
-                        
                 }
         },
         
@@ -352,7 +351,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             
             // Clear variables--including repetitions.
             this.hashInstance = null;
-            this.hashLayerNumber = null;
             this.hashElementMapToLayer = null;
                         this.arrLayers = [];
 
@@ -376,7 +374,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 this._bindDocumentEvents();
                 
             this.hashInstance = this.createLayerHashTable();
-            //this.hashLayerNumber = this.createLayerNumberHash();
             this.hashElementMapToLayer = this.createElementMapToLayer();
             this.initTimelineForDocument();
         }
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 00136c4d..17e50789 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -357,7 +357,9 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         },
         set:function(val){
             this._trackData = val;
-            this.setData();
+            if(this._trackData){
+                this.setData();
+            }
         }
     },
 
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index b9ec40ad..77c0dfa8 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -26,7 +26,9 @@ var Tween = exports.Tween = Montage.create(Component, {
         },
         set:function(val){
             this._tweenData = val;
-            this.setData();
+            if(this._tweenData){
+                this.setData();
+            }
         }
     },