aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Tween.reel
diff options
context:
space:
mode:
authorAnanya Sen2012-04-04 13:20:15 -0700
committerAnanya Sen2012-04-04 13:20:15 -0700
commit22ade57a30b45774882028eef4ab5a5bffe1a624 (patch)
tree52e589450eeb8adf7e11b66bd222fec5fa66c963 /js/panels/Timeline/Tween.reel
parentbec4cde986975d1cc5f1d2791fdb18548fc2d72a (diff)
parent8482e23cd9b8c4700b5130f2588e5eb24d376536 (diff)
downloadninja-22ade57a30b45774882028eef4ab5a5bffe1a624.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Codeview-improvements
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