diff options
| author | Jonathan Duran | 2012-04-04 11:21:46 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-04-04 11:21:46 -0700 |
| commit | 04ca16276e73dbd238b42fd898f8b3cccc730f18 (patch) | |
| tree | 95aee6605f1018550875812166d292554830d7ca /js/panels/Timeline/Tween.reel | |
| parent | 61404b1965ffe7011ec86953f853f0954ccc308d (diff) | |
| parent | a11ef2eed7049835c8bdfa50a2b893632c46eaa0 (diff) | |
| download | ninja-04ca16276e73dbd238b42fd898f8b3cccc730f18.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/tools/SelectionTool.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
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 27828c3c..5410c77c 100644 --- a/js/panels/Timeline/Tween.reel/Tween.js +++ b/js/panels/Timeline/Tween.reel/Tween.js | |||
| @@ -169,7 +169,7 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
| 169 | 169 | ||
| 170 | if (event.detail.source && event.detail.source !== "tween") { | 170 | if (event.detail.source && event.detail.source !== "tween") { |
| 171 | // check for correct element selection | 171 | // check for correct element selection |
| 172 | if (this.application.ninja.selectedElements[0]._element != this.parentComponent.parentComponent.animatedElement) { | 172 | if (this.application.ninja.selectedElements[0]!= this.parentComponent.parentComponent.animatedElement) { |
| 173 | console.log("Wrong element selected for this keyframe track"); | 173 | console.log("Wrong element selected for this keyframe track"); |
| 174 | } else { | 174 | } else { |
| 175 | // update tweenedProperties and tell containing track to update CSS rule | 175 | // update tweenedProperties and tell containing track to update CSS rule |