diff options
| author | Kruti Shah | 2012-06-26 13:10:50 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-06-26 13:10:50 -0700 |
| commit | 0217858c93c54c9b65da4c4c52730a5221664ea8 (patch) | |
| tree | 696ba23b6c66237eae5c98b0c3fee62909841708 /js/panels/Timeline/Tween.reel | |
| parent | a2047a565aa5ef8643c5d71de3cc484191d6c671 (diff) | |
| parent | d9170ea8ac54aa2aefd43de15defb439e65fa1f3 (diff) | |
| download | ninja-0217858c93c54c9b65da4c4c52730a5221664ea8.tar.gz | |
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'js/panels/Timeline/Tween.reel')
| -rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js index 682a8619..2d4ae75d 100644 --- a/js/panels/Timeline/Tween.reel/Tween.js +++ b/js/panels/Timeline/Tween.reel/Tween.js | |||
| @@ -206,7 +206,6 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
| 206 | if (event.detail.source && event.detail.source !== "tween") { | 206 | if (event.detail.source && event.detail.source !== "tween") { |
| 207 | 207 | ||
| 208 | if(this.parentComponent.parentComponent.isSubproperty){ | 208 | if(this.parentComponent.parentComponent.isSubproperty){ |
| 209 | console.log("setting style tween property") | ||
| 210 | this.setStyleTweenProperty(event.detail); | 209 | this.setStyleTweenProperty(event.detail); |
| 211 | } else { | 210 | } else { |
| 212 | // check for correct element selection | 211 | // check for correct element selection |