aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Tween.reel
diff options
context:
space:
mode:
authorPushkar Joshi2012-03-12 15:26:10 -0700
committerPushkar Joshi2012-03-12 15:26:10 -0700
commit46b2e561fa6ca054cad58e4c372a598bbb7ee2c9 (patch)
tree38d1c8666098a10078834c1eaac3d455135bee12 /js/panels/Timeline/Tween.reel
parent7b4b068cadc0af8ec7e930e1c2b429e945f96984 (diff)
parent69d90467865a1384725b2301901be2180c5a841f (diff)
downloadninja-46b2e561fa6ca054cad58e4c372a598bbb7ee2c9.tar.gz
Merge branch 'master' into brushtool
Diffstat (limited to 'js/panels/Timeline/Tween.reel')
-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();