aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Tween.reel/Tween.js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-04-16 16:06:24 -0700
committerNivesh Rajbhandari2012-04-16 16:06:24 -0700
commitc253192a08b499ea7be46fa5438d273e51f7ec5a (patch)
tree18a1f0e3679c0eb993a9dedb537035d3861f49ac /js/panels/Timeline/Tween.reel/Tween.js
parente19376c54eedd1f1c457ba405b2f110be376a559 (diff)
parent4b900ea5cd6bb77eb30cec8c03b9ec9fa662c1e9 (diff)
downloadninja-c253192a08b499ea7be46fa5438d273e51f7ec5a.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'js/panels/Timeline/Tween.reel/Tween.js')
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js7
1 files changed, 2 insertions, 5 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index 77c0dfa8..7339139f 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -44,7 +44,6 @@ var Tween = exports.Tween = Montage.create(Component, {
44 }, 44 },
45 set: function(value){ 45 set: function(value){
46 this._spanWidth = value; 46 this._spanWidth = value;
47 this.needsDraw = true;
48 } 47 }
49 }, 48 },
50 49
@@ -59,7 +58,6 @@ var Tween = exports.Tween = Montage.create(Component, {
59 }, 58 },
60 set:function (value) { 59 set:function (value) {
61 this._spanPosition = value; 60 this._spanPosition = value;
62 this.needsDraw = true;
63 } 61 }
64 }, 62 },
65 63
@@ -74,7 +72,6 @@ var Tween = exports.Tween = Montage.create(Component, {
74 }, 72 },
75 set:function (value) { 73 set:function (value) {
76 this._keyFramePosition = value; 74 this._keyFramePosition = value;
77 this.needsDraw = true;
78 } 75 }
79 }, 76 },
80 77
@@ -133,7 +130,6 @@ var Tween = exports.Tween = Montage.create(Component, {
133 }, 130 },
134 set:function (value) { 131 set:function (value) {
135 this._isTweenAnimated = value; 132 this._isTweenAnimated = value;
136 this.needsDraw = true;
137 } 133 }
138 }, 134 },
139 135
@@ -157,6 +153,7 @@ var Tween = exports.Tween = Montage.create(Component, {
157 this.tweenID = this.tweenData.tweenID; 153 this.tweenID = this.tweenData.tweenID;
158 this.tweenedProperties = this.tweenData.tweenedProperties; 154 this.tweenedProperties = this.tweenData.tweenedProperties;
159 this.isTweenAnimated = this.tweenData.isTweenAnimated; 155 this.isTweenAnimated = this.tweenData.isTweenAnimated;
156 this.needsDraw = true;
160 } 157 }
161 }, 158 },
162 159
@@ -165,7 +162,7 @@ var Tween = exports.Tween = Montage.create(Component, {
165 162
166 if (event.detail.source && event.detail.source !== "tween") { 163 if (event.detail.source && event.detail.source !== "tween") {
167 // check for correct element selection 164 // check for correct element selection
168 if (this.application.ninja.selectedElements[0]._element != this.parentComponent.parentComponent.animatedElement) { 165 if (this.application.ninja.selectedElements[0]!= this.parentComponent.parentComponent.animatedElement) {
169 console.log("Wrong element selected for this keyframe track"); 166 console.log("Wrong element selected for this keyframe track");
170 } else { 167 } else {
171 // update tweenedProperties and tell containing track to update CSS rule 168 // update tweenedProperties and tell containing track to update CSS rule