Use className as type in queue

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/Effects.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/Effects.java
index fd77124a589c8b73c47d2fde3c71014d2c9d3293..9c103c8e8d89e0c3316f5e2c29d9bccd441c3d43 100644 (file)
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/Effects.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/Effects.java
@@ -456,13 +456,6 @@ public class Effects extends GQueryQueue {
       final Easing easing, final Function complete) {\r
     return animate(properties, speed.getDuration(), easing, complete);\r
   }\r
-  \r
-  /**\r
-   * Removes a queued function from the front of the FX queue and executes it.\r
-   */\r
-  public Effects dequeue() {\r
-    return (Effects)dequeue("__FX");\r
-  }\r
 \r
   /**\r
    * Fade in all matched elements by adjusting their opacity. Only the opacity\r
@@ -598,14 +591,6 @@ public class Effects extends GQueryQueue {
     return this;\r
   }\r
 \r
-  /**\r
-   * Adds a new function, to be executed, onto the end of the queue of all\r
-   * matched elements in the FX queue.\r
-   */\r
-  public GQueryQueue queue(Function data) {\r
-    return queue("__FX", data);\r
-  }\r
-\r
   /**\r
    * Displays each of the set of matched elements if they are hidden.\r
    */\r

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 91dd9a84d988c9df914192bb685f843303997763..b278c203066e84232fd275b0f3a20cee435dc5a4 100644 (file)
--- 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
@@ -392,6 +392,10 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
   public GQuery(Element element) {\r
     elements = JSArray.create(element);\r
   }\r
+  \r
+  public GQuery(GQuery gq) {\r
+    this(gq.get());\r
+  }\r
 \r
   /**\r
    * Add elements to the set of matched elements if they are not included yet.\r
@@ -810,9 +814,11 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
    *    public String f(Element e, int i)\r
    */\r
   public GQuery each(Function... f) {\r
-    for (Function f1 : f) {\r
-      for (int i = 0; i < elements.getLength(); i++) {\r
-        f1.f(elements.getItem(i), i);\r
+    if (f != null) {\r
+      for (Function f1 : f) {\r
+        for (int i = 0; i < elements.getLength(); i++) {\r
+          f1.f(elements.getItem(i), i);\r
+        }\r
       }\r
     }\r
     return this;\r

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/GQueryQueue.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/GQueryQueue.java
index 13d75c7d58ad0592d8f785ab2da8e56671ea54b7..16c95069c65e3055e84dfb739b8ce36db16a541f 100644 (file)
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/GQueryQueue.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/GQueryQueue.java
@@ -51,8 +51,8 @@ public abstract class GQueryQueue extends GQuery {
     }-*/;
   }
 
-  public GQueryQueue(Element element) {
-    super(element);
+  public GQueryQueue(GQuery gq) {
+    super(gq);
   }
 
   public GQueryQueue(JSArray elements) {
@@ -63,32 +63,28 @@ public abstract class GQueryQueue extends GQuery {
     super(list);
   }
 
+  public GQueryQueue(Element element) {
+    super(element);
+  }
+
   /**
    * Removes a queued function from the front of the queue and executes it.
    */
-  public GQueryQueue dequeue(String type) {
+  public GQueryQueue dequeue() {
     for (Element e : elements()) {
-      dequeue(e, type);
+      dequeue(e);
     }
     return this;
   }
 
 
-  /**
-   * Returns a reference to the first element's queue (which is an array of
-   * functions).
-   */
-  public Queue<Function> queue(String type) {
-    return queue(elements.getItem(0), type, null);
-  }
-
   /**
    * Adds a new function, to be executed, onto the end of the queue of all
    * matched elements.
    */
-  public GQueryQueue queue(String type, Function func) {
+  public GQueryQueue queue(Function func) {
     for (Element e : elements()) {
-      queue(e, type, func);
+      queue(e, func);
     }
     return this;
   }
@@ -96,22 +92,18 @@ public abstract class GQueryQueue extends GQuery {
   /**
    * Replaces the current queue with the given queue on all matched elements.
    */
-  public GQueryQueue queue(String type, Queue<?> queue) {
+  public GQueryQueue queue(Queue<?> queue) {
     for (Element e : elements()) {
-      replacequeue(e, type, queue);
+      replacequeue(e, queue);
     }
     return this;
   }
 
-  private void dequeue(Element elem, String type) {
-    Queue<Function> q = queue(elem, type, null);
-
+  private void dequeue(Element elem) {
+    Queue<Function> q = queue(elem, null);
     if (q != null) {
       Function f = q.dequeue();
-
-      if (SelectorEngine.eq(type, "__FX")) {
-        f = q.peek(0);
-      }
+      f = q.peek(0);
       if (f != null) {
         f.f(elem);
       }
@@ -119,30 +111,30 @@ public abstract class GQueryQueue extends GQuery {
   }
 
   @SuppressWarnings("unchecked")
-  private Queue<Function> queue(Element elem, String type, Function func) {
+  private Queue<Function> queue(Element elem, Function func) {
     if (elem != null) {
-      type = type + "queue";
-      Queue<Function> q = (Queue<Function>) data(elem, type, null);
+      Queue<Function> q = (Queue<Function>) data(elem, getQueueType(), null);
       if (q == null) {
-        q = (Queue<Function>) data(elem, type, Queue.newInstance());
+        q = (Queue<Function>) data(elem, getQueueType(), Queue.newInstance());
       }
       if (func != null) {
         q.enqueue(func);
       }
-      if (SelectorEngine.eq(type, "__FXqueue") && q.length() == 1) {
-        if (func != null) {
-          func.f(elem);
-        }
+      if (q.length() == 1 && func != null) {
+        func.f(elem);
       }
       return q;
     }
     return null;
   }
 
-  private void replacequeue(Element elem, String type, Queue<?> queue) {
+  private void replacequeue(Element elem, Queue<?> queue) {
     if (elem != null) {
-      type = type + "queue";
-      data(elem, type, queue);
+      data(elem, getQueueType(), queue);
     }
   }
+  
+  protected String getQueueType() {
+    return "GQueryQueue_" + this.getClass().getName(); 
+  }
 }