From: Manuel Carrasco Moñino <manuel.carrasco.m@gmail.com>
Date: Sun, 3 Nov 2013 19:07:13 +0000 (+0100)
Subject: Support for transition chainning and queueing
X-Git-Tag: release-1.4.0~35^2~4
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ddc98cee3b4a943fa3552e1d826706958a2c4528;p=gwtquery.git

Support for transition chainning and queueing
---

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java
index 036a3081..a5cb1a59 100644
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java
@@ -4363,10 +4363,14 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
    * The transition() method allows you to create animation effects on any numeric HTML Attribute,
    * CSS property, or color using CSS3 transformations and transitions.
    * 
-   * It works similar to animate()
+   * It works similar to animate(), and support chainning and queueing.
    *
    * Example:
    * $("#foo").transition("{ opacity: 0.1, scale: 2, x: 50, y: 50 }", 5000, EasingCurve.easeInBack);
+   * 
+   * $("#bar")
+   *  .transition("{ opacity: 0.1, scale: 2, x: 50, y: 50 }", 5000, EasingCurve.easeInBack)
+   *  .transition("{x: +100, width: +40px}", 2000, EasingCurve.easeOut);     
    *
    */
   public GQuery transition(Object stringOrProperties, int duration, Easing easing, Function... funcs) {
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 21324b1a..b4cb8f2c 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
@@ -45,6 +45,10 @@ import com.google.gwt.user.client.DOM;
      .promise().done(new Function(){public void f() {
         g1.transition("{x: +100}", 2000, "linear", 0);
      }});
+     
+    $("#bar")
+     .transition("{ opacity: 0.1, scale: 2, x: 50, y: 50 }", 5000, EasingCurve.easeInBack)
+     .transition("{x: +100, width: +40px}", 2000, EasingCurve.easeOut);     
 
  * </pre>
  */
@@ -267,6 +271,13 @@ public class Transitions extends GQuery {
   
   /**
    * Works like GQuery.animate(), but uses CSS transitions.
+   * 
+   * It allows chaining like:
+   * <pre>
+    $("#foo")
+      .transition("{ opacity: 0.1, scale: 2, x: 50, y: 50 }", 5000, EasingCurve.easeInBack)
+      .transition("{x: +100, width: +40px}", 2000, EasingCurve.easeOut);
+   * </pre>
    */
   public Transitions transition(Object stringOrProperties, int duration, Easing easing, int delay, final Function... funcs) {
     final Properties p = (stringOrProperties instanceof String) ? $$((String) stringOrProperties) : (Properties) stringOrProperties;
@@ -277,29 +288,27 @@ public class Transitions extends GQuery {
       easing = EasingCurve.ease;
     }
     
-    // Force reflow before setting transitions, so as we do not animate previous values
-    css("offsetHeight");
-
     String attribs = duration + "ms" + " "  + easing.toString() + " " + delay + "ms";
     List<String> props = filterPropertyNames(p);
     String value  = "";
     for (String s : props) {
       value += (value.isEmpty() ? "" : ", ") + s + " " + attribs;
-    }    
-    css(transition, value);
-    
-    // Force reflow so as we are assure css transition property has been set 
-    // to the elements before setting other properties.
-    css("offsetHeight");
+    }
     
-    // Use our override css method to set all props 
-    css(p);
-    // prevent memory leak
-    removeData(TRANSFORM);
+    // Use gQuery queue, so as we can chain transitions
+    final String transitionValue = value;
+    delay(0, new Function(){public void f() {
+      // Configure animation using transition property
+      css(transition, transitionValue);
+      // Set all css properties for this transition 
+      css(p);
+      // prevent memory leak
+      removeData(TRANSFORM);
+    }});
     
     // restore oldTransitions in the element, and use the queue to prevent more effects being run.
     // TODO: Use transitionEnd events once GQuery supports non-bit events
-    delay(duration, new Function(){public void f() {
+    delay(duration + delay, new Function(){public void f() {
       css(transition, oldTransitions);
       each(funcs);
     }});