diff options
| author | Manuel Carrasco Moñino <manuel.carrasco.m@gmail.com> | 2013-12-10 20:49:31 +0100 |
|---|---|---|
| committer | Manuel Carrasco Moñino <manuel.carrasco.m@gmail.com> | 2013-12-10 20:49:31 +0100 |
| commit | 1a3e42976c6ddf8eb0fc8736efc0875dd9ced58b (patch) | |
| tree | 4e4f2ef8332e0e00239f12795acf6b2f8ca611ea | |
| parent | 0cf26dedc1a0e990fce6a8149b73eb03c6f6432e (diff) | |
| parent | 0d30f11c1f03de893431159ef613aa94c304dfe5 (diff) | |
| download | gwtquery-1a3e42976c6ddf8eb0fc8736efc0875dd9ced58b.tar.gz gwtquery-1a3e42976c6ddf8eb0fc8736efc0875dd9ced58b.zip | |
Merge branch 'master' into gquery_1_4_release
| -rw-r--r-- | gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/effects/Transitions.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/effects/Transitions.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/effects/Transitions.java index a0f021f6..57403501 100644 --- a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/effects/Transitions.java +++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/effects/Transitions.java @@ -332,17 +332,17 @@ public class Transitions extends GQuery { newTransitionValue += (newTransitionValue.isEmpty() ? "" : ", ") + s + " " + attribs; } - final Transitions $this = $(this).as(Transitions); + final Transitions thisTrans = $(this).as(Transitions); // Configure animation using transition property - $this.css(transition, newTransitionValue); + thisTrans.css(transition, newTransitionValue); // Set all css properties for this transition using the css method in this class - $this.css(cssProps); + thisTrans.css(cssProps); // TODO: Use transitionEnd events once GQuery supports non-bit events // last time I tried, setting 'transitionEnd' made custom events fail (slideEnter) new Timer() { public void run() { - $this.css(transition, oldTransitionValue).each(funcs).dequeue(); + thisTrans.css(transition, oldTransitionValue).each(funcs).dequeue(); } }.schedule(d + duration); } |