aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Tween.reel
diff options
context:
space:
mode:
authorhwc4872012-04-04 16:32:53 -0700
committerhwc4872012-04-04 16:32:53 -0700
commit6ee8b65742fbe61b4429dc8c7dc9ca33a3e43600 (patch)
treef267e05f623ed90d1cc841b8c79a338d6d8e807c /js/panels/Timeline/Tween.reel
parent16f62ca09cc428043e8fef8bdeea11a989e62bc0 (diff)
parent17ca01f54591187f5c0812c0fd2cb7260afa9639 (diff)
downloadninja-6ee8b65742fbe61b4429dc8c7dc9ca33a3e43600.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Snapping
Conflicts: js/panels/presets/animations-presets.reel/animations-presets.js js/panels/presets/style-presets.reel/style-presets.js js/panels/presets/transitions-presets.reel/transitions-presets.js
Diffstat (limited to 'js/panels/Timeline/Tween.reel')
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index 2b308d9a..7339139f 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -162,7 +162,7 @@ var Tween = exports.Tween = Montage.create(Component, {
162 162
163 if (event.detail.source && event.detail.source !== "tween") { 163 if (event.detail.source && event.detail.source !== "tween") {
164 // check for correct element selection 164 // check for correct element selection
165 if (this.application.ninja.selectedElements[0]._element != this.parentComponent.parentComponent.animatedElement) { 165 if (this.application.ninja.selectedElements[0]!= this.parentComponent.parentComponent.animatedElement) {
166 console.log("Wrong element selected for this keyframe track"); 166 console.log("Wrong element selected for this keyframe track");
167 } else { 167 } else {
168 // update tweenedProperties and tell containing track to update CSS rule 168 // update tweenedProperties and tell containing track to update CSS rule