diff options
| author | John Mayhew | 2012-04-04 14:41:16 -0700 |
|---|---|---|
| committer | John Mayhew | 2012-04-04 14:41:16 -0700 |
| commit | 7249d6377c8897b2f9d8115be99717be971a0981 (patch) | |
| tree | 9415f5ba25ad643df678e561719d2708fd3ead5a /js/panels/Timeline/Tween.reel | |
| parent | ebdfa77a5399d245ddf134ee8110b2d046922a71 (diff) | |
| parent | 8482e23cd9b8c4700b5130f2588e5eb24d376536 (diff) | |
| download | ninja-7249d6377c8897b2f9d8115be99717be971a0981.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts:
js/lib/drawing/world.js
Diffstat (limited to 'js/panels/Timeline/Tween.reel')
| -rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.js | 2 |
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 |