aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Tween.reel/Tween.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-03-09 13:36:41 -0800
committerJose Antonio Marquez2012-03-09 13:36:41 -0800
commit9a03f869ff4520431da3ac8c64b748b5fbb60339 (patch)
treedad948f012cbc7d65e0dccde273667a389ff1c6d /js/panels/Timeline/Tween.reel/Tween.js
parentb0b4a1ee6792d98f06cbd8ecf5291e66db8a4eef (diff)
parentb4eb2f6cc1208fe5c18aa1f02a85adda25075d81 (diff)
downloadninja-9a03f869ff4520431da3ac8c64b748b5fbb60339.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'js/panels/Timeline/Tween.reel/Tween.js')
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js10
1 files changed, 2 insertions, 8 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index 729abd64..6ff38bef 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -134,12 +134,6 @@ var Tween = exports.Tween = Montage.create(Component, {
134 } 134 }
135 }, 135 },
136 136
137 prepareForDraw:{
138 value:function () {
139
140 }
141 },
142
143 draw:{ 137 draw:{
144 value:function () { 138 value:function () {
145 this.element.style.left = this.spanPosition + "px"; 139 this.element.style.left = this.spanPosition + "px";
@@ -157,7 +151,7 @@ var Tween = exports.Tween = Montage.create(Component, {
157 if (event.detail.source && event.detail.source !== "tween") { 151 if (event.detail.source && event.detail.source !== "tween") {
158 // check for correct element selection 152 // check for correct element selection
159 if (this.application.ninja.selectedElements[0]._element != this.parentComponent.parentComponent.animatedElement) { 153 if (this.application.ninja.selectedElements[0]._element != this.parentComponent.parentComponent.animatedElement) {
160 alert("Wrong element selected for this keyframe track"); 154 console.log("Wrong element selected for this keyframe track");
161 } else { 155 } else {
162 // update tweenedProperties and tell containing track to update CSS rule 156 // update tweenedProperties and tell containing track to update CSS rule
163 // temp read only top and left. need to change to loop over event details for prop changes generically 157 // temp read only top and left. need to change to loop over event details for prop changes generically
@@ -181,7 +175,7 @@ var Tween = exports.Tween = Montage.create(Component, {
181 175
182 // select the containing layer 176 // select the containing layer
183 var selectIndex = this.application.ninja.timeline.getLayerIndexByID(this.parentComponent.parentComponent.trackID); 177 var selectIndex = this.application.ninja.timeline.getLayerIndexByID(this.parentComponent.parentComponent.trackID);
184 this.application.ninja.timeline.selectLayer(selectIndex); 178 this.application.ninja.timeline.selectLayer(selectIndex, true);
185 179
186 // tell timeline to deselect all other tweens and push this one as the currentSelectedTweens in timeline 180 // tell timeline to deselect all other tweens and push this one as the currentSelectedTweens in timeline
187 this.application.ninja.timeline.deselectTweens(); 181 this.application.ninja.timeline.deselectTweens();