aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Tween.reel/Tween.js
diff options
context:
space:
mode:
authorJonathan Duran2012-03-08 19:55:13 -0800
committerJonathan Duran2012-03-08 19:55:13 -0800
commitdae6290c5f779dbff1d3b508615898b1ec26bb18 (patch)
tree40825a2f6ed82b015aaf76b1b79238e269a89ea6 /js/panels/Timeline/Tween.reel/Tween.js
parent1c61c69265b9c0230b834c0d4d7c78a11f9d5b19 (diff)
parentb96c5803a90e028af20f8ebce441d7a57608b99e (diff)
downloadninja-dae6290c5f779dbff1d3b508615898b1ec26bb18.tar.gz
Merge branch 'refs/heads/SerialKiller' into TimelineUber
Diffstat (limited to 'js/panels/Timeline/Tween.reel/Tween.js')
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js45
1 files changed, 30 insertions, 15 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index 6ff38bef..77c0dfa8 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -14,6 +14,24 @@ var Tween = exports.Tween = Montage.create(Component, {
14 value: true 14 value: true
15 }, 15 },
16 16
17 _tweenData:{
18 serializable: true,
19 value:{}
20 },
21
22 tweenData:{
23 serializable: true,
24 get:function(){
25 return this._tweenData;
26 },
27 set:function(val){
28 this._tweenData = val;
29 if(this._tweenData){
30 this.setData();
31 }
32 }
33 },
34
17 _spanWidth: { 35 _spanWidth: {
18 serializable: true, 36 serializable: true,
19 value: 0 37 value: 0
@@ -118,21 +136,6 @@ var Tween = exports.Tween = Montage.create(Component, {
118 this.needsDraw = true; 136 this.needsDraw = true;
119 } 137 }
120 }, 138 },
121
122 _isClearing : {
123 serializable: true,
124 value: false
125 },
126 isClearing : {
127 get: function() {
128 return this._isClearing;
129 },
130 set: function(newVal) {
131 if (newVal === "clear it") {
132 this.eventManager.removeEventListener("elementChange", this, false);
133 }
134 }
135 },
136 139
137 draw:{ 140 draw:{
138 value:function () { 141 value:function () {
@@ -145,6 +148,18 @@ var Tween = exports.Tween = Montage.create(Component, {
145 } 148 }
146 }, 149 },
147 150
151 setData:{
152 value:function(){
153 this.spanWidth = this.tweenData.spanWidth;
154 this.keyFramePosition = this.tweenData.keyFramePosition;
155 this.spanPosition = this.tweenData.spanPosition;
156 this.keyFrameMillisec = this.tweenData.keyFrameMillisec;
157 this.tweenID = this.tweenData.tweenID;
158 this.tweenedProperties = this.tweenData.tweenedProperties;
159 this.isTweenAnimated = this.tweenData.isTweenAnimated;
160 }
161 },
162
148 handleElementChange:{ 163 handleElementChange:{
149 value:function (event) { 164 value:function (event) {
150 165