aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Duran2012-03-07 11:32:37 -0800
committerJonathan Duran2012-03-07 11:32:37 -0800
commita1fd19bff814afa2f4a0299f860055b1e338cf3d (patch)
tree3412a9046760af1a3aecec245199e216a9d63e75
parentf6835e48d3597ecb8cf1da8bcc91b58a8227d389 (diff)
downloadninja-a1fd19bff814afa2f4a0299f860055b1e338cf3d.tar.gz
Bugfixes from optimization
Signed-off-by: Jonathan Duran <jduran@motorola.com>
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js18
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js1
2 files changed, 10 insertions, 9 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index df1770da..0500ec11 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -108,7 +108,7 @@ var Layer = exports.Layer = Montage.create(Component, {
108 /* Position and Transform hottext values */ 108 /* Position and Transform hottext values */
109 _dtextPositionX : { 109 _dtextPositionX : {
110 value:null, 110 value:null,
111 serializable: true, 111 serializable: true
112 }, 112 },
113 113
114 dtextPositionX:{ 114 dtextPositionX:{
@@ -127,7 +127,7 @@ var Layer = exports.Layer = Montage.create(Component, {
127 127
128 _dtextPositionY : { 128 _dtextPositionY : {
129 value:null, 129 value:null,
130 serializable: true, 130 serializable: true
131 }, 131 },
132 132
133 dtextPositionY:{ 133 dtextPositionY:{
@@ -146,7 +146,7 @@ var Layer = exports.Layer = Montage.create(Component, {
146 146
147 _dtextScaleX : { 147 _dtextScaleX : {
148 value:null, 148 value:null,
149 serializable: true, 149 serializable: true
150 }, 150 },
151 151
152 dtextScaleX:{ 152 dtextScaleX:{
@@ -165,7 +165,7 @@ var Layer = exports.Layer = Montage.create(Component, {
165 165
166 _dtextScaleY : { 166 _dtextScaleY : {
167 value:null, 167 value:null,
168 serializable: true, 168 serializable: true
169 }, 169 },
170 170
171 dtextScaleY:{ 171 dtextScaleY:{
@@ -184,7 +184,7 @@ var Layer = exports.Layer = Montage.create(Component, {
184 184
185 _dtextSkewX : { 185 _dtextSkewX : {
186 value:null, 186 value:null,
187 serializable: true, 187 serializable: true
188 }, 188 },
189 189
190 dtextSkewX:{ 190 dtextSkewX:{
@@ -203,7 +203,7 @@ var Layer = exports.Layer = Montage.create(Component, {
203 203
204 _dtextSkewY : { 204 _dtextSkewY : {
205 value:null, 205 value:null,
206 serializable: true, 206 serializable: true
207 }, 207 },
208 208
209 dtextSkewY:{ 209 dtextSkewY:{
@@ -222,7 +222,7 @@ var Layer = exports.Layer = Montage.create(Component, {
222 222
223 _dtextRotate : { 223 _dtextRotate : {
224 value:null, 224 value:null,
225 serializable: true, 225 serializable: true
226 }, 226 },
227 227
228 dtextRotate:{ 228 dtextRotate:{
@@ -397,7 +397,9 @@ var Layer = exports.Layer = Montage.create(Component, {
397 }, 397 },
398 set:function(val){ 398 set:function(val){
399 this._layerData = val; 399 this._layerData = val;
400 this.setData(); 400 if(this._layerData){
401 this.setData();
402 }
401 } 403 }
402 }, 404 },
403 405
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 54c40676..94d9daec 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -499,7 +499,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
499 this._firstTimeLoaded = false; 499 this._firstTimeLoaded = false;
500 } else { 500 } else {
501 this.arrLayers.length = 0; 501 this.arrLayers.length = 0;
502 this.arrTracks.length = 0;
503 this.hashKey = node.uuid; 502 this.hashKey = node.uuid;
504 503
505 if (this.returnedObject = this.hashInstance.getItem(this.hashKey)) { 504 if (this.returnedObject = this.hashInstance.getItem(this.hashKey)) {