diff options
| author | Eric Guzman | 2012-04-04 11:42:23 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-04-04 11:42:23 -0700 |
| commit | c394a1cf04bbf3b9ad3003ec86498a30d00926bb (patch) | |
| tree | 52c2b672734d4112f101ec3c8e8e2a61f18ebd4f /js/panels/Timeline/Tween.reel | |
| parent | 2a5374af0b06e0402498b61985fd3c67d063729b (diff) | |
| parent | a11ef2eed7049835c8bdfa50a2b893632c46eaa0 (diff) | |
| download | ninja-c394a1cf04bbf3b9ad3003ec86498a30d00926bb.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
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 |