diff options
| author | Armen Kesablyan | 2012-04-04 11:34:19 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-04-04 11:34:19 -0700 |
| commit | 211f514882144de8df69ebb2106f3b446be1dda0 (patch) | |
| tree | c8eaf3d9fc7ac1bc841320e73d41818fbfb5827d /js/panels/Timeline/Tween.reel | |
| parent | 5a5d0f68dd82b829405a0b301dd11b4cf385c8d5 (diff) | |
| parent | a11ef2eed7049835c8bdfa50a2b893632c46eaa0 (diff) | |
| download | ninja-211f514882144de8df69ebb2106f3b446be1dda0.tar.gz | |
Merge branch 'refs/heads/master' into BugFixes
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 |