From: Manolo Carrasco <manolo@apache.org>
Date: Mon, 21 Jun 2010 09:10:09 +0000 (+0000)
Subject: - Implemented the stop() method in queue
X-Git-Tag: release-1.3.2~685
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bc0672c61b193b477a5fadadf52fb9eb1e9c916b;p=gwtquery.git

- Implemented the stop() method in queue
- Fixed some issues in css (width, height, opacity)
- Fix PropertiesAnimation to handle correctly non-px units
- Fixed an NPE in getParent
- Moved some useful static method into a new GQUtils class
- More tests
---

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/Function.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/Function.java
index 005b9d2a..b15fba2f 100644
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/Function.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/Function.java
@@ -22,6 +22,12 @@ import com.google.gwt.user.client.Event;
  * Extend this class to implement functions callbacks.
  */
 public abstract class Function {
+  
+  /**
+   * Override this to define a cancel action.
+   */
+  public void cancel(Element e) {
+  }
 
   /**
    * Override this for GQuery methods which loop over matched elements and
diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/GQUtils.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/GQUtils.java
new file mode 100644
index 00000000..6be21c5e
--- /dev/null
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/GQUtils.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2009 Google Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.gwt.query.client;
+
+import java.util.HashSet;
+
+import com.google.gwt.core.client.JavaScriptObject;
+import com.google.gwt.core.client.JsArray;
+import com.google.gwt.dom.client.Element;
+import com.google.gwt.user.client.DOM;
+
+/**
+ * A bunch of utility methods for GQuery.
+ * 
+ * These methods could be moved to $ class, but the class
+ * doesn't work right now.
+ */
+public class GQUtils {
+
+  /**
+   * Returns the numeric value of a css property.
+   *  
+   * The parameter force has a special meaning:
+   * - When force is false, returns the value of the css property defined
+   *   in the set of style attributes. 
+   * - Otherwise it returns the real computed value.   
+   */
+  public static double cur(Element elem, String prop, boolean force) {
+    if (elem.getPropertyString(prop) != null
+        && (elem.getStyle() == null || elem.getStyle().getProperty(prop) == null)) {
+      return elem.getPropertyDouble(prop);
+    }
+    GQuery g = GQuery.$(elem);
+    String val = g.css(prop, force);
+    if ("thick".equalsIgnoreCase(val)) {
+      return (5);
+    } else if ("medium".equalsIgnoreCase(val)) {
+      return (3);
+    } else if ("thin".equalsIgnoreCase(val)) {
+      return (1);
+    }
+    if (!val.matches("^[\\d\\.]+.*$")) {
+      val = g.css(prop, false); 
+    }
+    val = val.trim().replaceAll("[^\\d\\.\\-]+.*$", "");
+    return val.length() == 0 ? 0 : Double.parseDouble(val);
+  }
+
+  /**
+   * Compare two numbers using javascript equality.
+   */
+  public static native boolean eq(double s1, double s2) /*-{
+     return s1 == s2;
+  }-*/;
+
+  /**
+   * Compare two objects using javascript equality.
+   */
+  public static native boolean eq(Object s1, Object s2) /*-{
+     return s1 == s2;
+  }-*/;
+
+  /**
+   * Load an external javascript library.
+   * The inserted script replaces the element with the
+   * given id in the document.
+   */
+  public static void loadScript(String url, String id) {
+    GQuery gs = GQuery.$(DOM.createElement("script"));
+    GQuery gp = GQuery.$("#" + id).parent();
+    if (gp.size() != 1) {
+      gp = GQuery.$(GQuery.document.getBody());
+    }
+    GQuery.$("#" + id).remove();
+    gp.append(gs.attr("src", url).attr("type", "text/javascript").attr("id", id));
+  }
+
+  /**
+   * Check if a number is true in the javascript scope. 
+   */
+  public static native boolean truth(double a) /*-{
+    return a ? true : false;
+  }-*/;
+
+  /**
+   * Check if an object is true in the javascript scope. 
+   */
+  public static native boolean truth(Object a) /*-{
+    return a ? true : false;
+  }-*/;
+
+  public static JsArray<Element> unique(JsArray<Element> a) {
+    JsArray<Element> ret = JavaScriptObject.createArray().cast();
+    HashSet<Integer> f = new HashSet<Integer>();
+    for (int i = 0; i < a.length(); i++) {
+      Element e = a.get(i);
+      if (!f.contains(e.hashCode())) {
+        f.add(e.hashCode());
+        ret.push(e);
+      }
+    }    
+    return ret;
+  }
+
+}
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 394e27eb..16e93d83 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
@@ -39,7 +39,6 @@ import com.google.gwt.query.client.css.Percentage;
 import com.google.gwt.query.client.css.TakesLength;
 import com.google.gwt.query.client.css.TakesPercentage;
 import com.google.gwt.query.client.impl.DocumentStyleImpl;
-import com.google.gwt.query.client.impl.SelectorEngineImpl;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.Window;
 
@@ -268,45 +267,6 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
     }
   }
 
-  /**
-   * Returns the numeric value of an element css property
-   */
-  public static double cur(Element elem, String prop) {
-    GQuery g = $(elem);
-    String val = g.css(prop, true);
-    if ("height".equalsIgnoreCase(prop)) {
-      return elem.getClientHeight() - cur(elem, "paddingTop") - cur(elem, "paddingBottom");
-    }
-    if ("width".equalsIgnoreCase(prop)) {
-      return elem.getClientWidth() - cur(elem, "paddingLeft") - cur(elem, "paddingRight");
-    }
-    if ("absolute".equalsIgnoreCase(g.css("position", true))) {
-      if ("left".equalsIgnoreCase(prop)) {
-        return g.offset().left;
-      }
-      if ("top".equalsIgnoreCase(prop)) {
-        return g.offset().top;
-      }
-    }
-    if ("opacity".equalsIgnoreCase(prop)) {
-      return Double.parseDouble(val);
-    }
-    if (elem.getPropertyString(prop) != null
-        && (elem.getStyle() == null || elem.getStyle().getProperty(prop) == null)) {
-      return elem.getPropertyDouble(prop);
-    }
-    
-    if ("thick".equalsIgnoreCase(val)) {
-      return (5);
-    } else if ("medium".equalsIgnoreCase(val)) {
-      return (3);
-    } else if ("thin".equalsIgnoreCase(val)) {
-      return (1);
-    }
-    val = "0" + val.replaceAll("[^\\d\\.]+", "");
-    return Double.parseDouble(val);
-  }
-  
   /**
    * Return a lazy version of the GQuery interface. Lazy function calls are
    * simply queued up and not executed immediately.
@@ -353,6 +313,7 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
       postWrap = "</colgroup></table>";
     }
     // TODO: fix IE link tag serialization
+    // TODO: fix IE <script> tag
     Element div = document.createDivElement();
     div.setInnerHTML(preWrap + elem + postWrap);
     Node n = div;
@@ -923,7 +884,6 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
         e.removeChild(e.getFirstChild());
       }
     }
-
     return this;
   }
 
@@ -1492,7 +1452,10 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
   public GQuery parent() {
     JSArray result = JSArray.create();
     for (Element e : elements()) {
-      result.addNode(e.getParentElement());
+      Element p = e.getParentElement();
+      if (p != null) {
+        result.addNode(p);
+      }
     }
     return new GQuery(unique(result));
   }
@@ -2043,7 +2006,7 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
    * only works on arrays of DOM elements, not strings or numbers.
    */
   public JSArray unique(JSArray result) {
-    return SelectorEngineImpl.unique(result.<JsArray<Element>>cast()).cast();
+    return GQUtils.unique(result.<JsArray<Element>>cast()).cast();
   }
 
   /**
@@ -2436,5 +2399,6 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
     } else {
       dataCache.delete(id);
     }
-  }   
+  }
+  
 }
diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/SelectorEngine.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/SelectorEngine.java
index 367cd887..c1feeb6f 100644
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/SelectorEngine.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/SelectorEngine.java
@@ -16,7 +16,6 @@
 package com.google.gwt.query.client;
 
 import com.google.gwt.core.client.GWT;
-import com.google.gwt.core.client.JavaScriptObject;
 import com.google.gwt.dom.client.Document;
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.Node;
@@ -28,10 +27,6 @@ import com.google.gwt.query.client.impl.SelectorEngineImpl;
  */
 public class SelectorEngine {
 
-  public static native boolean eq(String s1, String s2) /*-{
-       return s1 == s2;
-    }-*/;
-
   public static native NodeList<Element> getElementsByClassName(String clazz,
       Node ctx) /*-{
         return ctx.getElementsByClassName(clazz);
@@ -54,14 +49,6 @@ public class SelectorEngine {
       return ctx.querySelectorAll(selector);
   }-*/;
 
-  public static boolean truth(String a) {
-    return GWT.isScript() ? truth0(a) : a != null && !"".equals(a);
-  }
-
-  public static boolean truth(JavaScriptObject a) {
-    return GWT.isScript() ? truth0(a) : a != null;
-  }
-
   public static NodeList<Element> xpathEvaluate(String selector, Node ctx) {
     return xpathEvaluate(selector, ctx, JSArray.create());
   }
@@ -78,14 +65,6 @@ public class SelectorEngine {
       return r;
   }-*/;
 
-  private static native boolean truth0(String a) /*-{
-       return a;
-    }-*/;
-
-  private static native boolean truth0(JavaScriptObject a) /*-{
-         return a;
-      }-*/;
-
   private SelectorEngineImpl impl;
 
   public SelectorEngine() {
diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/DocumentStyleImpl.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/DocumentStyleImpl.java
index 95f4e632..2c331dbe 100644
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/DocumentStyleImpl.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/DocumentStyleImpl.java
@@ -16,6 +16,7 @@
 package com.google.gwt.query.client.impl;
 
 import com.google.gwt.dom.client.Element;
+import com.google.gwt.query.client.GQUtils;
 
 /**
  * A helper class to get computed CSS styles for elements.
@@ -51,14 +52,23 @@ public class DocumentStyleImpl {
    */
   public String curCSS(Element elem, String name, boolean force) {
     name = fixPropertyName(name);
-    if (force) {
-      return getComputedStyle(elem, hyphenize(name), name, null);
-    } else {
+    if ("height".equalsIgnoreCase(name)) {
+      return String.valueOf(getHeight(elem));
+    }
+    if ("width".equalsIgnoreCase(name)) {
+      return String.valueOf(getWidth(elem));
+    }    
+    if ("opacity".equalsIgnoreCase(name)) {
+      return String.valueOf(getOpacity(elem));
+    }
+    if (!force && elem.getStyle().getProperty(name) != null) {
       String ret = elem.getStyle().getProperty(name);
       return ret == null ? "" : ret;
+    } else {
+      return getComputedStyle(elem, hyphenize(name), name, null);
     }
   }
-
+  
   /**
    * Fix style property names.
    */
@@ -71,13 +81,38 @@ public class DocumentStyleImpl {
     return camelize(name);
   }
 
+  public int getHeight(Element e) {
+    return (int) (e.getClientHeight() - num(curCSS(e, "paddingTop", true)) - num(curCSS(e, "paddingBottom", true)));
+  }
+  
+  public double getOpacity(Element e) {
+    String o = e.getStyle().getOpacity();
+    return GQUtils.truth(o) ? num(o) : 1;
+  }
+  
+  public int getWidth(Element e) {
+    return (int) (e.getClientWidth() - num(curCSS(e, "paddingLeft", true)) - num(curCSS(e, "paddingRight", true)));
+  }
+
+  /**
+   * Return whether the element is visible
+   */
+  public boolean isVisible(Element e) {
+    return !"none".equalsIgnoreCase(curCSS(e, "display", true));
+  }
+
+  public double num(String val) {
+    val = val.trim().replaceAll("[^\\d\\.\\-]+.*$", "");
+    return GQUtils.truth(val) ? Double.parseDouble(val) : 0;
+  }
+
   /**
    * Remove a style property from an element.
    */
   public void removeStyleProperty(Element elem, String prop) {
     elem.getStyle().setProperty(prop, "");
   }
-
+  
   /**
    * Set the value of a style property of an element.
    */
@@ -95,18 +130,11 @@ public class DocumentStyleImpl {
       e.getStyle().setProperty(prop, val);
     }
   }
-  
-  /**
-   * Return whether the element is visible
-   */
-  public boolean isVisible(Element e) {
-    return !"none".equalsIgnoreCase(curCSS(e, "display", true));
-  }
 
   protected native String getComputedStyle(Element elem, String hyphenName,
       String camelName, String pseudo) /*-{
     var cStyle = $doc.defaultView.getComputedStyle(elem, pseudo);
     return cStyle ? cStyle.getPropertyValue(hyphenName) : null;
   }-*/;
-
+  
 }
diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/DocumentStyleImplIE.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/DocumentStyleImplIE.java
index 0b7b45e7..a1e8071b 100644
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/DocumentStyleImplIE.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/DocumentStyleImplIE.java
@@ -22,35 +22,7 @@ import com.google.gwt.dom.client.Style;
  * A helper class to get computed CSS styles for elements on IE6.
  */
 public class DocumentStyleImplIE extends DocumentStyleImpl {
-
-  /**
-   * Return the string value of a css property of an element. 
-   * IE needs a special workaround to handle opacity.
-   * 
-   * The parameter force has a special meaning here:
-   * - When force is false, returns the value of the css property defined
-   *   in the style attribute of the element. 
-   * - Otherwise it returns the real computed value.
-   * 
-   * For instance if you define 'display=none' not in the element style
-   * but in the css stylesheet, it returns an empty string unless you
-   * pass the parameter force=true.   
-   */
-  @Override
-  public String curCSS(Element elem, String name, boolean force) {
-    if ("opacity".equalsIgnoreCase(name)) {
-      Style s = elem.getStyle();
-      String o = s.getProperty("filter");
-      if (o != null) {
-        return !o.matches(".*opacity=.*") ? "1" : ("" + 
-            (Double.valueOf(o.replaceAll("[^\\d]", "")) / 100));
-      }
-      o = s.getProperty("opacity");
-      return o == null || o.length() == 0 ? "1" : o;
-    }
-    return super.curCSS(elem, name, force);
-  }
-
+  
   /**
    * Fix style property names.
    */
@@ -65,12 +37,35 @@ public class DocumentStyleImplIE extends DocumentStyleImpl {
     return name;
   }
 
+  @Override
+  public int getHeight(Element e) {
+    return (int) (e.getOffsetHeight() - num(curCSS(e, "paddingTop", true)) - num(curCSS(e, "paddingBottom", true))
+        - num(curCSS(e, "borderTopWidth", true)) - num(curCSS(e, "borderBottomWidth", true)));
+  }
+
+  @Override
+  public double getOpacity(Element e) {
+    Style s = e.getStyle();
+    String o = s.getProperty("filter");
+    if (o != null) {
+      return !o.matches(".*opacity=.*") ? 1 : Double.valueOf(o.replaceAll("[^\\d]", "")) / 100;
+    }
+    return super.getOpacity(e);
+  }
+
+  @Override
+  public int getWidth(Element e) {
+    return (int) (e.getOffsetWidth() - num(curCSS(e, "paddingLeft", true)) - num(curCSS(e, "paddingRight", true))
+        - num(curCSS(e, "borderRightWidth", true)) - num(curCSS(e, "borderRightWidth", true)));
+  }
+  
   /**
    * Remove a style property from an element.
    */
   public native void removeStyleProperty(Element elem, String prop) /*-{
     elem.style.removeAttribute(prop);
   }-*/;
+  
 
   /**
    * Set the value of a style property of an element. 
@@ -79,35 +74,38 @@ public class DocumentStyleImplIE extends DocumentStyleImpl {
   @Override
   public void setStyleProperty(Element e, String prop, String val) {
     if ("opacity".equals(prop)) {
-      e.getStyle().setProperty("zoom", "1");
-      e.getStyle().setProperty("filter",
-          "alpha(opacity=" + (int) (Double.valueOf(val) * 100) + ")");
+      setOpacity(e, val);
     } else {
       super.setStyleProperty(e, prop, val);
     }
   }
-
+  
   @Override
   protected native String getComputedStyle(Element elem, String hyphenName,
       String camelName, String pseudo) /*-{
     // code lifted from jQuery
     var style = elem.style;
     var ret = elem.currentStyle[hyphenName] || elem.currentStyle[camelName];
-    // From the awesome hack by Dean Edwards
-    // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
-    // If we're not dealing with a regular pixel number
-    // but a number that has a weird ending, we need to convert it to pixels
     if ( !/^\d+(px)?$/i.test( ret ) && /^\d/.test( ret ) ) {
-    // Remember the original values
-    var left = style.left, rsLeft = elem.runtimeStyle.left;
-    // Put in the new values to get a computed value out
-    elem.runtimeStyle.left = elem.currentStyle.left;
-    style.left = ret || 0;
-    ret = style.pixelLeft + "px";
-    // Revert the changed values
-    style.left = left;
-    elem.runtimeStyle.left = rsLeft;
+      // Remember the original values
+      var left = style.left, rsLeft = elem.runtimeStyle.left;
+      // Put in the new values to get a computed value out
+      elem.runtimeStyle.left = elem.currentStyle.left;
+      style.left = ret || 0;
+      ret = style.pixelLeft + "px";
+      // Revert the changed values
+      style.left = left;
+      elem.runtimeStyle.left = rsLeft;
     }
     return ret;
   }-*/;
+
+  private void setOpacity(Element e, String val) {
+    if (val == null || val.trim().length() == 0) {
+      val = "1";
+    }
+    e.getStyle().setProperty("zoom", "1");
+    e.getStyle().setProperty("filter",
+        "alpha(opacity=" + (int) (Double.valueOf(val) * 100) + ")");
+  }
 }
\ No newline at end of file
diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngineCssToXPath.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngineCssToXPath.java
index 83f5bb5f..4aced3b6 100644
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngineCssToXPath.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngineCssToXPath.java
@@ -21,6 +21,7 @@ import com.google.gwt.core.client.JsArray;
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.Node;
 import com.google.gwt.dom.client.NodeList;
+import com.google.gwt.query.client.GQUtils;
 import com.google.gwt.query.client.JSArray;
 import com.google.gwt.query.client.Regexp;
 import com.google.gwt.query.client.SelectorEngine;
@@ -188,7 +189,7 @@ public class SelectorEngineCssToXPath extends SelectorEngineImpl {
       sel = css2Xpath(sel);
     }
     SelectorEngine.xpathEvaluate(sel, ctx, elm);
-    return unique(elm.<JsArray<Element>> cast()).cast();
+    return GQUtils.unique(elm.<JsArray<Element>> cast()).cast();
   }
   
 }
diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngineImpl.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngineImpl.java
index 4e5a1a71..65a2442c 100644
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngineImpl.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngineImpl.java
@@ -14,17 +14,16 @@
  * the License.
  */
 package com.google.gwt.query.client.impl;
+import static com.google.gwt.query.client.GQUtils.eq;
+import static com.google.gwt.query.client.GQUtils.truth;
 
-import java.util.HashSet;
 
-import com.google.gwt.core.client.JavaScriptObject;
-import com.google.gwt.core.client.JsArray;
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.Node;
 import com.google.gwt.dom.client.NodeList;
+import com.google.gwt.query.client.GQUtils;
 import com.google.gwt.query.client.JSArray;
 import com.google.gwt.query.client.Regexp;
-import com.google.gwt.query.client.SelectorEngine;
 
 /**
  * Base/Utility class for runtime selector engine implementations.
@@ -87,21 +86,21 @@ public abstract class SelectorEngineImpl {
     Regexp expressionRegExp = new Regexp(
         "^((odd|even)|([1-9]\\d*)|((([1-9]\\d*)?)n((\\+|\\-)(\\d+))?)|(\\-(([1-9]\\d*)?)n\\+(\\d+)))$");
     JSArray pseudoValue = expressionRegExp.exec(expression);
-    if (!SelectorEngine.truth(pseudoValue)) {
+    if (!truth(pseudoValue)) {
       return null;
     } else {
-      if (SelectorEngine.truth(pseudoValue.getStr(2))) {        // odd or even
-        start = (SelectorEngine.eq(pseudoValue.getStr(2), "odd")) ? 1 : 2;
+      if (truth(pseudoValue.getStr(2))) {        // odd or even
+        start = (eq(pseudoValue.getStr(2), "odd")) ? 1 : 2;
         modVal = (start == 1) ? 1 : 0;
-      } else if (SelectorEngine
+      } else if (GQUtils
           .truth(pseudoValue.getStr(3))) {        // single digit
         start = Integer.parseInt(pseudoValue.getStr(3), 10);
         add = 0;
         max = start;
-      } else if (SelectorEngine.truth(pseudoValue.getStr(4))) {        // an+b
-        add = SelectorEngine.truth(pseudoValue.getStr(6)) ? Integer
+      } else if (truth(pseudoValue.getStr(4))) {        // an+b
+        add = truth(pseudoValue.getStr(6)) ? Integer
             .parseInt(pseudoValue.getStr(6), 10) : 1;
-        start = SelectorEngine.truth(pseudoValue.getStr(7)) ? Integer.parseInt(
+        start = truth(pseudoValue.getStr(7)) ? Integer.parseInt(
             (pseudoValue.getStr(8).charAt(0) == '+' ? ""
                 : pseudoValue.getStr(8)) + pseudoValue.getStr(9), 10) : 0;
         while (start < 1) {
@@ -109,8 +108,8 @@ public abstract class SelectorEngineImpl {
         }
         modVal = (start > add) ? (start - add) % add
             : ((start == add) ? 0 : start);
-      } else if (SelectorEngine.truth(pseudoValue.getStr(10))) {        // -an+b
-        add = SelectorEngine.truth(pseudoValue.getStr(12)) ? Integer
+      } else if (truth(pseudoValue.getStr(10))) {        // -an+b
+        add = truth(pseudoValue.getStr(12)) ? Integer
             .parseInt(pseudoValue.getStr(12), 10) : 1;
         start = max = Integer.parseInt(pseudoValue.getStr(13), 10);
         while (start > add) {
@@ -135,17 +134,4 @@ public abstract class SelectorEngineImpl {
    * @return a list of matched nodes
    */
   public abstract NodeList<Element> select(String selector, Node ctx);
-
-  public static JsArray<Element> unique(JsArray<Element> a) {
-    JsArray<Element> ret = JavaScriptObject.createArray().cast();
-    HashSet<Integer> f = new HashSet<Integer>();
-    for (int i = 0; i < a.length(); i++) {
-      Element e = a.get(i);
-      if (!f.contains(e.hashCode())) {
-        f.add(e.hashCode());
-        ret.push(e);
-      }
-    }    
-    return ret;
-  }
 }
diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngineJS.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngineJS.java
index afbaaa14..2dd040de 100644
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngineJS.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngineJS.java
@@ -20,6 +20,7 @@ import com.google.gwt.dom.client.Document;
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.Node;
 import com.google.gwt.dom.client.NodeList;
+import com.google.gwt.query.client.GQUtils;
 import com.google.gwt.query.client.JSArray;
 import com.google.gwt.query.client.Regexp;
 import com.google.gwt.query.client.SelectorEngine;
@@ -58,22 +59,22 @@ public class SelectorEngineJS extends SelectorEngineImpl {
     }-*/;
 
   private static String attrToRegExp(String attrVal, String op) {
-    if (SelectorEngine.eq("^", op)) {
+    if (GQUtils.eq("^", op)) {
       return "^" + attrVal;
     }
-    if (SelectorEngine.eq("$", op)) {
+    if (GQUtils.eq("$", op)) {
       return attrVal + "$";
     }
-    if (SelectorEngine.eq("*", op)) {
+    if (GQUtils.eq("*", op)) {
       return attrVal;
     }
-    if (SelectorEngine.eq("|", op)) {
+    if (GQUtils.eq("|", op)) {
       return "(^" + attrVal + "(\\-\\w+)*$)";
     }
-    if (SelectorEngine.eq("~", op)) {
+    if (GQUtils.eq("~", op)) {
       return "\\b" + attrVal + "\\b";
     }
-    return SelectorEngine.truth(attrVal) ? "^" + attrVal + "$" : null;
+    return GQUtils.truth(attrVal) ? "^" + attrVal + "$" : null;
   }
 
   private static native boolean checked(Node previous) /*-{
@@ -108,9 +109,9 @@ public class SelectorEngineJS extends SelectorEngineImpl {
   private static void getGeneralSiblingNodes(JSArray matchingElms,
       JSArray nextTag, Regexp nextRegExp, Node prevRef) {
     while (
-        SelectorEngine.truth((prevRef = SelectorEngine.getNextSibling(prevRef)))
+        GQUtils.truth((prevRef = SelectorEngine.getNextSibling(prevRef)))
             && !isAdded(prevRef)) {
-      if (!SelectorEngine.truth(nextTag) || nextRegExp
+      if (!GQUtils.truth(nextTag) || nextRegExp
           .test(prevRef.getNodeName())) {
         setAdded(prevRef, true);
         matchingElms.addNode(prevRef);
@@ -121,11 +122,11 @@ public class SelectorEngineJS extends SelectorEngineImpl {
   private static void getSiblingNodes(JSArray matchingElms, JSArray nextTag,
       Regexp nextRegExp, Node prevRef) {
     while (
-        SelectorEngine.truth(prevRef = SelectorEngine.getNextSibling(prevRef))
+        GQUtils.truth(prevRef = SelectorEngine.getNextSibling(prevRef))
             && prevRef.getNodeType() != Node.ELEMENT_NODE) {
     }
-    if (SelectorEngine.truth(prevRef)) {
-      if (!SelectorEngine.truth(nextTag) || nextRegExp
+    if (GQUtils.truth(prevRef)) {
+      if (!GQUtils.truth(nextTag) || nextRegExp
           .test(prevRef.getNodeName())) {
         matchingElms.addNode(prevRef);
       }
@@ -182,7 +183,7 @@ public class SelectorEngineJS extends SelectorEngineImpl {
       if (a > 0) {
         identical = false;
         for (int b = 0, bl = a; b < bl; b++) {
-          if (SelectorEngine.eq(selectors[a], selectors[b])) {
+          if (GQUtils.eq(selectors[a], selectors[b])) {
             identical = true;
             break;
           }
@@ -199,23 +200,23 @@ public class SelectorEngineJS extends SelectorEngineImpl {
         String rule = cssSelectors.getStr(i);
         if (i > 0 && childOrSiblingRefRegExp.test(rule)) {
           JSArray childOrSiblingRef = childOrSiblingRefRegExp.exec(rule);
-          if (SelectorEngine.truth(childOrSiblingRef)) {
+          if (GQUtils.truth(childOrSiblingRef)) {
             JSArray nextTag = new Regexp("^\\w+")
                 .exec(cssSelectors.getStr(i + 1));
             Regexp nextRegExp = null;
             String nextTagStr = null;
-            if (SelectorEngine.truth(nextTag)) {
+            if (GQUtils.truth(nextTag)) {
               nextTagStr = nextTag.getStr(0);
               nextRegExp = new Regexp("(^|\\s)" + nextTagStr + "(\\s|$)", "i");
             }
             for (int j = 0, jlen = prevElem.size(); j < jlen; j++) {
               Node prevRef = prevElem.getNode(j);
               String ref = childOrSiblingRef.getStr(0);
-              if (SelectorEngine.eq(">", ref)) {
+              if (GQUtils.eq(">", ref)) {
                 getDescendantNodes(matchingElms, nextTagStr, prevRef);
-              } else if (SelectorEngine.eq("+", ref)) {
+              } else if (GQUtils.eq("+", ref)) {
                 getSiblingNodes(matchingElms, nextTag, nextRegExp, prevRef);
-              } else if (SelectorEngine.eq("~", ref)) {
+              } else if (GQUtils.eq("~", ref)) {
                 getGeneralSiblingNodes(matchingElms, nextTag, nextRegExp,
                     prevRef);
               }
@@ -231,19 +232,19 @@ public class SelectorEngineJS extends SelectorEngineImpl {
         }
         JSArray cssSelector = cssSelectorRegExp.exec(rule);
         SplitRule splitRule = new SplitRule(
-            !SelectorEngine.truth(cssSelector.getStr(1)) || SelectorEngine
+            !GQUtils.truth(cssSelector.getStr(1)) || GQUtils
                 .eq(cssSelector.getStr(3), "*") ? "*" : cssSelector.getStr(1),
-            !SelectorEngine.eq(cssSelector.getStr(3), "*") ? cssSelector
+            !GQUtils.eq(cssSelector.getStr(3), "*") ? cssSelector
                 .getStr(2) : null, cssSelector.getStr(4), cssSelector.getStr(6),
             cssSelector.getStr(10));
-        if (SelectorEngine.truth(splitRule.id)) {
+        if (GQUtils.truth(splitRule.id)) {
           Element domelem = Document.get()
               .getElementById(splitRule.id.substring(1));
-          if (SelectorEngine.truth(domelem)) {
+          if (GQUtils.truth(domelem)) {
             matchingElms = JSArray.create(domelem);
           }
           prevElem = matchingElms;
-        } else if (SelectorEngine.truth(splitRule.tag) && !isSkipped(
+        } else if (GQUtils.truth(splitRule.tag) && !isSkipped(
             prevElem)) {
           if (i == 0 && matchingElms.size() == 0 && prevElem.size() == 1) {
             prevElem = matchingElms = JSArray.create(
@@ -270,7 +271,7 @@ public class SelectorEngineJS extends SelectorEngineImpl {
             break;
           }
           setSkipTag(prevElem, false);
-          if (SelectorEngine.truth(splitRule.allClasses)) {
+          if (GQUtils.truth(splitRule.allClasses)) {
             String[] allClasses = splitRule.allClasses.replaceFirst("^\\.", "")
                 .split("\\.");
             Regexp[] regExpClassNames = new Regexp[allClasses.length];
@@ -283,7 +284,7 @@ public class SelectorEngineJS extends SelectorEngineImpl {
               Element current = prevElem.getElement(o);
               String elmClass = current.getClassName();
               boolean addElm = false;
-              if (SelectorEngine.truth(elmClass) && !isAdded(current)) {
+              if (GQUtils.truth(elmClass) && !isAdded(current)) {
                 for (int p = 0, pl = regExpClassNames.length; p < pl; p++) {
                   addElm = regExpClassNames[p].test(elmClass);
                   if (!addElm) {
@@ -299,7 +300,7 @@ public class SelectorEngineJS extends SelectorEngineImpl {
             clearAdded(prevElem);
             prevElem = matchingElms = matchingClassElms;
           }
-          if (SelectorEngine.truth(splitRule.allAttr)) {
+          if (GQUtils.truth(splitRule.allAttr)) {
             JSArray allAttr = Regexp
                 .match("\\[[^\\]]+\\]", "g", splitRule.allAttr);
             Regexp[] regExpAttributes = new Regexp[allAttr.size()];
@@ -310,12 +311,12 @@ public class SelectorEngineJS extends SelectorEngineImpl {
               JSArray attributeMatch = attributeMatchRegExp
                   .exec(allAttr.getStr(q));
               String attributeValue =
-                  SelectorEngine.truth(attributeMatch.getStr(3))
+                  GQUtils.truth(attributeMatch.getStr(3))
                       ? attributeMatch.getStr(3).replaceAll("\\.", "\\.")
                       : null;
               String attrVal = attrToRegExp(attributeValue,
                   (SelectorEngine.or(attributeMatch.getStr(2), null)));
-              regExpAttributes[q] = (SelectorEngine.truth(attrVal) ? new Regexp(
+              regExpAttributes[q] = (GQUtils.truth(attrVal) ? new Regexp(
                   attrVal) : null);
               regExpAttributesStr[q] = attributeMatch.getStr(1);
             }
@@ -329,7 +330,7 @@ public class SelectorEngineJS extends SelectorEngineImpl {
                 addElm = false;
                 Regexp attributeRegexp = regExpAttributes[s];
                 String currentAttr = getAttr(current, regExpAttributesStr[s]);
-                if (SelectorEngine.truth(currentAttr)
+                if (GQUtils.truth(currentAttr)
                     && currentAttr.length() != 0) {
                   if (attributeRegexp == null || attributeRegexp
                       .test(currentAttr)) {
@@ -346,7 +347,7 @@ public class SelectorEngineJS extends SelectorEngineImpl {
             }
             prevElem = matchingElms = matchingAttributeElms;
           }
-          if (SelectorEngine.truth(splitRule.allPseudos)) {
+          if (GQUtils.truth(splitRule.allPseudos)) {
             Regexp pseudoSplitRegExp = new Regexp(
                 ":(\\w[\\w\\-]*)(\\(([^\\)]+)\\))?");
 
@@ -355,9 +356,9 @@ public class SelectorEngineJS extends SelectorEngineImpl {
                     splitRule.allPseudos);
             for (int t = 0, tl = allPseudos.size(); t < tl; t++) {
               JSArray pseudo = pseudoSplitRegExp.match(allPseudos.getStr(t));
-              String pseudoClass = SelectorEngine.truth(pseudo.getStr(1))
+              String pseudoClass = GQUtils.truth(pseudo.getStr(1))
                   ? pseudo.getStr(1).toLowerCase() : null;
-              String pseudoValue = SelectorEngine.truth(pseudo.getStr(3))
+              String pseudoValue = GQUtils.truth(pseudo.getStr(3))
                   ? pseudo.getStr(3) : null;
               matchingElms = getElementsByPseudo(matchingElms, pseudoClass,
                   pseudoValue);
@@ -370,7 +371,7 @@ public class SelectorEngineJS extends SelectorEngineImpl {
       elm.pushAll(prevElem);
     }
 
-    return unique(elm.<JsArray<Element>>cast()).cast();
+    return GQUtils.unique(elm.<JsArray<Element>>cast()).cast();
   }
 
   protected String getAttr(Element current, String name) {
@@ -406,7 +407,7 @@ public class SelectorEngineJS extends SelectorEngineImpl {
     Node previous;
     for (int w = 0, wlen = previousMatch.size(); w < wlen; w++) {
       previous = previousMatch.getElement(w);
-      if (SelectorEngine
+      if (GQUtils
           .eq(((Element) previous).getAttribute(pseudoClass), pseudoValue)) {
         matchingElms.addNode(previous);
       }
@@ -428,33 +429,33 @@ public class SelectorEngineJS extends SelectorEngineImpl {
     JSArray prevParents = JSArray.create();
     boolean previousDir = pseudoClass.startsWith("first") ? true : false;
     JSArray matchingElms = JSArray.create();
-    if (SelectorEngine.eq("first-child", pseudoClass) || SelectorEngine
+    if (GQUtils.eq("first-child", pseudoClass) || GQUtils
         .eq("last-child", pseudoClass)) {
       getFirstChildPseudo(previousMatch, previousDir, matchingElms);
-    } else if (SelectorEngine.eq("only-child", pseudoClass)) {
+    } else if (GQUtils.eq("only-child", pseudoClass)) {
       getOnlyChildPseudo(previousMatch, matchingElms);
-    } else if (SelectorEngine.eq("nth-child", pseudoClass)) {
+    } else if (GQUtils.eq("nth-child", pseudoClass)) {
       matchingElms = getNthChildPseudo(previousMatch, pseudoValue, prevParents,
           matchingElms);
-    } else if (SelectorEngine.eq("first-of-type", pseudoClass) || SelectorEngine
+    } else if (GQUtils.eq("first-of-type", pseudoClass) || GQUtils
         .eq("last-of-type", pseudoClass)) {
       getFirstOfTypePseudo(previousMatch, previousDir, matchingElms);
-    } else if (SelectorEngine.eq("only-of-type", pseudoClass)) {
+    } else if (GQUtils.eq("only-of-type", pseudoClass)) {
       getOnlyOfTypePseudo(previousMatch, matchingElms);
-    } else if (SelectorEngine.eq("nth-of-type", pseudoClass)) {
+    } else if (GQUtils.eq("nth-of-type", pseudoClass)) {
       matchingElms = getNthOfTypePseudo(previousMatch, pseudoValue, prevParents,
           matchingElms);
-    } else if (SelectorEngine.eq("empty", pseudoClass)) {
+    } else if (GQUtils.eq("empty", pseudoClass)) {
       getEmptyPseudo(previousMatch, matchingElms);
-    } else if (SelectorEngine.eq("enabled", pseudoClass)) {
+    } else if (GQUtils.eq("enabled", pseudoClass)) {
       getEnabledPseudo(previousMatch, matchingElms);
-    } else if (SelectorEngine.eq("disabled", pseudoClass)) {
+    } else if (GQUtils.eq("disabled", pseudoClass)) {
       getDisabledPseudo(previousMatch, matchingElms);
-    } else if (SelectorEngine.eq("checked", pseudoClass)) {
+    } else if (GQUtils.eq("checked", pseudoClass)) {
       getCheckedPseudo(previousMatch, matchingElms);
-    } else if (SelectorEngine.eq("contains", pseudoClass)) {
+    } else if (GQUtils.eq("contains", pseudoClass)) {
       getContainsPseudo(previousMatch, pseudoValue, matchingElms);
-    } else if (SelectorEngine.eq("not", pseudoClass)) {
+    } else if (GQUtils.eq("not", pseudoClass)) {
       matchingElms = getNotPseudo(previousMatch, pseudoValue, matchingElms);
     } else {
       getDefaultPseudo(previousMatch, pseudoClass, pseudoValue, matchingElms);
@@ -489,17 +490,17 @@ public class SelectorEngineJS extends SelectorEngineImpl {
     for (int j = 0, jlen = previousMatch.size(); j < jlen; j++) {
       previous = next = previousMatch.getElement(j);
       if (previousDir) {
-        while (SelectorEngine
+        while (GQUtils
             .truth((next = SelectorEngine.getPreviousSibling(next)))
             && next.getNodeType() != Node.ELEMENT_NODE) {
         }
       } else {
         while (
-            SelectorEngine.truth((next = SelectorEngine.getNextSibling(next)))
+            GQUtils.truth((next = SelectorEngine.getNextSibling(next)))
                 && next.getNodeType() != Node.ELEMENT_NODE) {
         }
       }
-      if (!SelectorEngine.truth(next)) {
+      if (!GQUtils.truth(next)) {
         matchingElms.addNode(previous);
       }
     }
@@ -514,17 +515,17 @@ public class SelectorEngineJS extends SelectorEngineImpl {
 
       if (previousDir) {
         while (
-            SelectorEngine.truth(next = SelectorEngine.getPreviousSibling(next))
-                && !SelectorEngine
+            GQUtils.truth(next = SelectorEngine.getPreviousSibling(next))
+                && !GQUtils
                 .eq(next.getNodeName(), previous.getNodeName())) {
         }
       } else {
-        while (SelectorEngine.truth(next = SelectorEngine.getNextSibling(next))
-            && !SelectorEngine.eq(next.getNodeName(), previous.getNodeName())) {
+        while (GQUtils.truth(next = SelectorEngine.getNextSibling(next))
+            && !GQUtils.eq(next.getNodeName(), previous.getNodeName())) {
         }
       }
 
-      if (!SelectorEngine.truth(next)) {
+      if (!GQUtils.truth(next)) {
         matchingElms.addNode(previous);
       }
     }
@@ -545,11 +546,11 @@ public class SelectorEngineJS extends SelectorEngineImpl {
           "\\[(\\w+)(\\^|\\$|\\*|\\||~)?=?([\\w\\u00C0-\\uFFFF\\s\\-_\\.]+)?\\]")
           .exec(pseudoValue);
       Regexp notRegExp = new Regexp("(^|\\s)"
-          + (SelectorEngine.truth(notTag) ? notTag.getStr(1)
-          : SelectorEngine.truth(notClass) ? notClass.getStr(1) : "")
+          + (GQUtils.truth(notTag) ? notTag.getStr(1)
+          : GQUtils.truth(notClass) ? notClass.getStr(1) : "")
           + "(\\s|$)", "i");
-      if (SelectorEngine.truth(notAttr)) {
-        String notAttribute = SelectorEngine.truth(notAttr.getStr(3)) ? notAttr
+      if (GQUtils.truth(notAttr)) {
+        String notAttribute = GQUtils.truth(notAttr.getStr(3)) ? notAttr
             .getStr(3).replace("\\.", "\\.") : null;
         String notMatchingAttrVal = attrToRegExp(notAttribute,
             notAttr.getStr(2));
@@ -558,19 +559,19 @@ public class SelectorEngineJS extends SelectorEngineImpl {
       for (int v = 0, vlen = previousMatch.size(); v < vlen; v++) {
         Element notElm = previousMatch.getElement(v);
         Element addElm = null;
-        if (SelectorEngine.truth(notTag) && !notRegExp
+        if (GQUtils.truth(notTag) && !notRegExp
             .test(notElm.getNodeName())) {
           addElm = notElm;
-        } else if (SelectorEngine.truth(notClass) && !notRegExp
+        } else if (GQUtils.truth(notClass) && !notRegExp
             .test(notElm.getClassName())) {
           addElm = notElm;
-        } else if (SelectorEngine.truth(notAttr)) {
+        } else if (GQUtils.truth(notAttr)) {
           String att = getAttr(notElm, notAttr.getStr(1));
-          if (!SelectorEngine.truth(att) || !notRegExp.test(att)) {
+          if (!GQUtils.truth(att) || !notRegExp.test(att)) {
             addElm = notElm;
           }
         }
-        if (SelectorEngine.truth(addElm) && !isAdded(addElm)) {
+        if (GQUtils.truth(addElm) && !isAdded(addElm)) {
           setAdded(addElm, true);
           matchingElms.addNode(addElm);
         }
@@ -582,7 +583,7 @@ public class SelectorEngineJS extends SelectorEngineImpl {
   private JSArray getNthChildPseudo(JSArray previousMatch, String pseudoValue,
       JSArray prevParents, JSArray matchingElms) {
     Node previous;
-    if (SelectorEngine.eq(pseudoValue, "n")) {
+    if (GQUtils.eq(pseudoValue, "n")) {
       matchingElms = previousMatch;
     } else {
       Sequence sequence = getSequence(pseudoValue);
@@ -598,7 +599,7 @@ public class SelectorEngineJS extends SelectorEngineImpl {
                 || iteratorNext <= sequence.max)) {
               if (childElm.getNodeType() == Node.ELEMENT_NODE) {
                 if (++childCount == iteratorNext) {
-                  if (SelectorEngine
+                  if (GQUtils
                       .eq(childElm.getNodeName(), previous.getNodeName())) {
                     matchingElms.addNode(childElm);
                   }
@@ -632,9 +633,9 @@ public class SelectorEngineJS extends SelectorEngineImpl {
             int iteratorNext = sequence.start;
             int childCount = 0;
             Node childElm = prevParent.getFirstChild();
-            while (SelectorEngine.truth(childElm) && (sequence.max < 0
+            while (GQUtils.truth(childElm) && (sequence.max < 0
                 || iteratorNext <= sequence.max)) {
-              if (SelectorEngine
+              if (GQUtils
                   .eq(childElm.getNodeName(), previous.getNodeName())) {
                 if (++childCount == iteratorNext) {
                   matchingElms.addNode(childElm);
@@ -663,13 +664,13 @@ public class SelectorEngineJS extends SelectorEngineImpl {
       Node prevParent = previous.getParentNode();
       if (prevParent != kParent) {
         while (
-            SelectorEngine.truth(prev = SelectorEngine.getPreviousSibling(prev))
+            GQUtils.truth(prev = SelectorEngine.getPreviousSibling(prev))
                 && prev.getNodeType() != Node.ELEMENT_NODE) {
         }
-        while (SelectorEngine.truth(next = SelectorEngine.getNextSibling(next))
+        while (GQUtils.truth(next = SelectorEngine.getNextSibling(next))
             && next.getNodeType() != Node.ELEMENT_NODE) {
         }
-        if (!SelectorEngine.truth(prev) && !SelectorEngine.truth(next)) {
+        if (!GQUtils.truth(prev) && !GQUtils.truth(next)) {
           matchingElms.addNode(previous);
         }
         kParent = prevParent;
@@ -688,14 +689,14 @@ public class SelectorEngineJS extends SelectorEngineImpl {
       Node prevParent = previous.getParentNode();
       if (prevParent != oParent) {
         while (
-            SelectorEngine.truth(prev = SelectorEngine.getPreviousSibling(prev))
-                && !SelectorEngine
+            GQUtils.truth(prev = SelectorEngine.getPreviousSibling(prev))
+                && !GQUtils
                 .eq(prev.getNodeName(), previous.getNodeName())) {
         }
-        while (SelectorEngine.truth(next = SelectorEngine.getNextSibling(next))
-            && !SelectorEngine.eq(next.getNodeName(), previous.getNodeName())) {
+        while (GQUtils.truth(next = SelectorEngine.getNextSibling(next))
+            && !GQUtils.eq(next.getNodeName(), previous.getNodeName())) {
         }
-        if (!SelectorEngine.truth(prev) && !SelectorEngine.truth(next)) {
+        if (!GQUtils.truth(prev) && !GQUtils.truth(next)) {
           matchingElms.addNode(previous);
         }
         oParent = prevParent;
diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngineSizzle.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngineSizzle.java
index 389b424a..5d150e1d 100644
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngineSizzle.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngineSizzle.java
@@ -21,6 +21,7 @@ import com.google.gwt.core.client.JsArray;
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.Node;
 import com.google.gwt.dom.client.NodeList;
+import com.google.gwt.query.client.GQUtils;
 
 /**
  * Pure Javascript Selector Engine Implementation based on
@@ -728,6 +729,6 @@ public class SelectorEngineSizzle extends SelectorEngineImpl {
   
   public NodeList<Element> select(String selector, Node context) {
     JsArray<Element> results = JavaScriptObject.createArray().cast();
-    return unique(select(selector, context, results, null)).cast();
+    return GQUtils.unique(select(selector, context, results, null)).cast();
   }
 }
diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngineXPath.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngineXPath.java
index 578ce977..8a413f77 100644
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngineXPath.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngineXPath.java
@@ -15,17 +15,19 @@
  */
 package com.google.gwt.query.client.impl;
 
-import static com.google.gwt.query.client.SelectorEngine.eq;
-import static com.google.gwt.query.client.SelectorEngine.truth;
+import static com.google.gwt.query.client.GQUtils.eq;
+import static com.google.gwt.query.client.GQUtils.truth;
 
 import com.google.gwt.core.client.JsArray;
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.Node;
 import com.google.gwt.dom.client.NodeList;
+import com.google.gwt.query.client.GQUtils;
 import com.google.gwt.query.client.JSArray;
 import com.google.gwt.query.client.Regexp;
 import com.google.gwt.query.client.SelectorEngine;
 
+
 /**
  * Runtime selector engine implementation which translates selectors to XPath
  * and delegates to document.evaluate().
@@ -141,7 +143,7 @@ public class SelectorEngineXPath extends SelectorEngineImpl {
       }
       SelectorEngine.xpathEvaluate(xPathExpression, ctx, elm);
     }
-    return unique(elm.<JsArray<Element>>cast()).cast();
+    return GQUtils.unique(elm.<JsArray<Element>>cast()).cast();
   }
 
   private void init() {
diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/Effects.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/Effects.java
index 8ba38829..1df09436 100755
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/Effects.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/Effects.java
@@ -15,6 +15,7 @@
  */
 package com.google.gwt.query.client.plugins;
 
+import com.google.gwt.animation.client.Animation;
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.NodeList;
 import com.google.gwt.query.client.Function;
@@ -31,13 +32,18 @@ import com.google.gwt.query.client.plugins.PropertiesAnimation.Easing;
  */
 public class Effects extends GQueryQueue  {
   
+  /**
+   * Just a class to store predefined speed constant values.
+   */
   public static class Speed {
     public static final int DEFAULT = 400;
-    public static final int SLOW = 600;
     public static final int FAST = 200;
+    public static final int SLOW = 600;
   }
-  
+
   public static final Class<Effects> Effects = Effects.class;
+
+  private static final String EFFECTS_RUNNNING = "EffectsRunnning";
   
   static {
     GQuery.registerPlugin(Effects.class, new Plugin<Effects>() {
@@ -82,13 +88,21 @@ public class Effects extends GQueryQueue  {
   public Effects animate(final Properties p, final int duration,
       final Easing easing, final Function... funcs) {
     queue(new Function() {
+      public void cancel(Element e) {
+        Animation anim = (Animation) data(e, EFFECTS_RUNNNING, null);
+        if (anim != null) {
+          anim.cancel();
+        }
+      }
       public void f(Element e) {
-        new PropertiesAnimation(easing, e, p, funcs).run(duration);
+        Animation anim = new PropertiesAnimation(easing, e, p, funcs);
+        anim.run(duration);
+        data(e, EFFECTS_RUNNNING, anim);
       }
     });
     return this;
   }
-
+  
   /**
    * The animate() method allows us to create animation effects on any numeric CSS property. 
    * The only required parameter is a map of CSS properties. 
@@ -126,7 +140,7 @@ public class Effects extends GQueryQueue  {
    *  from the current value of the property.
    */  
   public Effects animate(String prop, int duration, Function... funcs) {
-    return animate($$(prop), duration, Easing.SWING, funcs);
+    return animate($$(prop), duration, Easing.LINEAR, funcs);
   }
 
   /**
@@ -149,10 +163,18 @@ public class Effects extends GQueryQueue  {
   public Effects clip(final ClipAnimation.Action a, final ClipAnimation.Corner c, 
       final ClipAnimation.Direction d, final int duration, final Function... f) {
     queue(new Function() {
+      public void cancel(Element e) {
+        Animation anim = (Animation) data(e, EFFECTS_RUNNNING, null);
+        if (anim != null) {
+          anim.cancel();
+        }
+      }
       public void f(Element e) {
-        new ClipAnimation(e, a, c, d, f).run(duration);
+        Animation anim = new ClipAnimation(e, a, c, d, f);
+        anim.run(duration);
+        data(e, EFFECTS_RUNNNING, a);
       }
-    });
+    });    
     return this;
   }
 
diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/GQueryQueue.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/GQueryQueue.java
index 2989838b..1193ebec 100644
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/GQueryQueue.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/GQueryQueue.java
@@ -29,6 +29,8 @@ import com.google.gwt.query.client.JSArray;
  */
 public abstract class GQueryQueue extends GQuery {
   
+  private static final String QUEUE_DATA_PREFIX = "GQueryQueue_";
+
   public GQueryQueue(Element element) {
     super(element);
   }
@@ -55,7 +57,6 @@ public abstract class GQueryQueue extends GQuery {
     return this;
   }
 
-
   /**
    * Adds a new function, to be executed, onto the end of the queue of all
    * matched elements.
@@ -76,9 +77,20 @@ public abstract class GQueryQueue extends GQuery {
     }
     return this;
   }
+  
+  /**
+   * Stop the function which is currently in execution, remove it
+   * from the queue an start the next one.  
+   */
+  public GQueryQueue stop() {
+    for (Element e : elements()) {
+      stop(e);
+    }
+    return this;
+  }
 
   protected String getQueueType() {
-    return "GQueryQueue_" + this.getClass().getName(); 
+    return QUEUE_DATA_PREFIX + this.getClass().getName(); 
   }
 
   private void dequeue(Element elem) {
@@ -88,12 +100,12 @@ public abstract class GQueryQueue extends GQuery {
       Object f = q.peek();
       if (f != null) {
         if (f instanceof Function) {
-          ((Function)f).f(elem);
+          ((Function) f).f(elem);
         }
       }
     }
   }
-
+  
   @SuppressWarnings("unchecked")
   private <S> Queue<S> queue(Element elem, S func) {
     if (elem != null) {
@@ -106,17 +118,30 @@ public abstract class GQueryQueue extends GQuery {
       }
       if (q.size() == 1 && func != null) {
         if (func instanceof Function) {
-          ((Function)func).f(elem);
+          ((Function) func).f(elem);
         }
       }
       return q;
     }
     return null;
   }
-  
+
   private void replacequeue(Element elem, Queue<?> queue) {
     if (elem != null) {
       data(elem, getQueueType(), queue);
     }
   }
+  
+  private void stop(Element elem) {
+    Queue<?> q = queue(elem, null);
+    if (q != null) {
+      Object f = q.peek();
+      if (f != null) {
+        if (f instanceof Function) {
+          ((Function) f).cancel(elem);
+        }
+      }
+      dequeue();
+    }
+  }
 }
diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/LazyEffects.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/LazyEffects.java
index 1b037f9d..7596e8b0 100644
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/LazyEffects.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/LazyEffects.java
@@ -14,6 +14,7 @@
  * the License.
  */
 package com.google.gwt.query.client.plugins;
+import com.google.gwt.animation.client.Animation;
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.NodeList;
 import com.google.gwt.query.client.Function;
diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/PropertiesAnimation.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/PropertiesAnimation.java
index b10c9cb4..eb6cc7b1 100755
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/PropertiesAnimation.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/PropertiesAnimation.java
@@ -20,6 +20,7 @@ import java.util.ArrayList;
 import com.google.gwt.animation.client.Animation;
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.query.client.Function;
+import com.google.gwt.query.client.GQUtils;
 import com.google.gwt.query.client.GQuery;
 import com.google.gwt.query.client.JSArray;
 import com.google.gwt.query.client.Properties;
@@ -37,10 +38,11 @@ public class PropertiesAnimation extends Animation {
     LINEAR, SWING
   }
   
-  private static class Effect {
-    private static Regexp nonPx = new Regexp(
-        "z-?index|font-?weight|opacity|zoom|line-?height", "i");
-
+  /**
+   * A pojo to store effect values.
+   */
+  public static class Effect {
+
     public String attr;
     public double end;
     public double start;
@@ -53,21 +55,67 @@ public class PropertiesAnimation extends Animation {
       this.value = value;
       this.start = start;
       this.end = end;
-      this.unit = nonPx.test(attr) ? "" : unit == null ? "px" : unit;
+      this.unit = unit;
     }
 
     public String getVal(double progress) {
       double ret = (start + ((end - start) * progress));
       return ("px".equals(unit) ? ((int) ret) : ret) + unit;
     }
+    
+    public String toString() {
+      return ("attr=" + attr + " value=" + value + " start=" + start + " end=" + end + " unit=" + unit).replaceAll("\\.0([^\\d])", "$1");
+    }
   }
-
+  
   private static final String[] attrsToSave = new String[] { "overflow",
       "visibility", "white-space" };
+
+  private static Regexp nonPxRegExp = new Regexp(
+      "z-?index|font-?weight|opacity|zoom|line-?height", "i");
+  
+  public static Effect computeFxProp(Element e, String key, String val, boolean hidden) {
+    GQuery g = Effects.$(e);
+    if ("toggle".equals(val)) {
+      val = hidden ? "show" : "hide";
+    }
+    double start = GQUtils.cur(e, key, true), end = start;
+    if ("show".equals(val)) {
+      if (!hidden) {
+        return null;
+      }
+      g.saveCssAttrs(key);
+      start = 0;
+    } else if ("hide".equals(val)) {
+      if (hidden) {
+        return null;
+      }
+      g.saveCssAttrs(key);
+      end = 0;
+    } 
+    JSArray parts = new Regexp("^([+-]=)?([0-9+-.]+)(.*)?$").match(val);
+    String unit = "";
+    if (parts != null) {
+      unit = nonPxRegExp.test(key) ? "" : parts.getStr(3) == null ? "px" : parts.getStr(3); 
+      end = Double.parseDouble(parts.getStr(2));
+      if (!"px".equals(unit)) {
+        double to = end == 0 ? 1 : end;
+        g.css(key, to + unit);
+        start = to * start / GQUtils.cur(e, key, true);
+        g.css(key, start + unit);
+      }
+      if (parts.getStr(1) != null) {
+        end = (("-=".equals(parts.getStr(1)) ? -1 : 1) * end) + start;
+      }
+    } 
+    Effect fx = new Effect(key, val, start, end, unit);
+    return fx;
+  }
   private Element e;
   private Easing easing = Easing.SWING;
   private ArrayList<Effect> effects = new ArrayList<Effect>();
   private Function[] funcs;
+
   private Effects g;
 
   private Properties prps;
@@ -105,48 +153,26 @@ public class PropertiesAnimation extends Animation {
 
   @Override
   public void onStart() {
-    boolean hidden = !g.visible();
     boolean resize = false;
+    boolean move = false;
+    boolean hidden = !g.visible();
+    Effect fx;
     g.show();
     for (String key : prps.keys()) {
       String val = prps.get(key);
-      if ("toggle".equals(val)) {
-        val = hidden ? "show" : "hide";
-      }
-      if (("top".equals(key) || "left".equals(key))
-          && !"absolute".equalsIgnoreCase(g.css("position", true))) {
-        g.css("position", "relative");
+      if ((fx = computeFxProp(e, key, val, hidden)) != null) {
+        effects.add(fx);
+        resize = resize || "height".equals(key) || "width".equals(key);
+        move = move || "top".equals(key) || "left".equals(key);
       }
-
-      JSArray parts = new Regexp("^([+-]=)?([0-9+-.]+)(.*)?$").match(val);
-      String unit = parts != null ? parts.getStr(3) : "";
-      double start = GQuery.cur(e, key);
-      double end = start;
-      if (parts != null) {
-        end = Double.parseDouble(parts.getStr(2));
-        if (parts.getStr(1) != null) {
-          end = (("-=".equals(parts.getStr(1)) ? -1 : 1) * end) + start;
-        }
-      } else if ("show".equals(val)) {
-        if (!hidden) {
-          return;
-        }
-        g.saveCssAttrs(key);
-        start = 0;
-      } else if ("hide".equals(val)) {
-        if (hidden) {
-          return;
-        }
-        g.saveCssAttrs(key);
-        end = 0;
-      }
-      resize = resize || "height".equals(key) || "width".equals(key);
-      effects.add(new Effect(key, val, start, end, unit));
     }
     g.saveCssAttrs(attrsToSave);
     if (resize) {
       g.css("overflow", "hidden");
     }
+    if (move && !g.css("position", true).matches("absolute|relative")) {
+      g.css("position", "relative");    
+    }
     g.css("visibility", "visible");
     g.css("white-space", "nowrap");
     super.onStart();
diff --git a/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryCoreTest.java b/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryCoreTest.java
index e53f77ca..df34fb8e 100644
--- a/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryCoreTest.java
+++ b/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryCoreTest.java
@@ -380,6 +380,21 @@ public class GQueryCoreTest extends GWTTestCase {
     assertHtmlEquals(expected, $(e).html());
   }
 
+  public void testOpacity() {
+    $(e)
+    .html(
+        "<p id='id1' style='opacity: 0.6; filter: alpha(opacity=60)'>Content 1</p>");
+    GQuery g = $("#id1");
+    assertEquals("0.6", g.css("opacity", false));
+    assertEquals("0.6", g.css("opacity", true));
+    g.css("opacity", "");
+    assertEquals("1.0", g.css("opacity", false));
+    assertEquals("1.0", g.css("opacity", true));
+    g.css("opacity", "0.4");
+    assertEquals("0.4", g.css("opacity", false));
+    assertEquals("0.4", g.css("opacity", true));
+  }
+  
   public void testProperties() {
     Properties p = $$("border:'1px solid black'");
     assertEquals(1, p.keys().length);
@@ -537,6 +552,35 @@ public class GQueryCoreTest extends GWTTestCase {
     $(e).html(content);
     assertHtmlEquals(expected, $("p", e).contains("test"));
   }
+
+  public void testShowHide() {
+    $(e)
+    .html(
+        "<p id='id1' style='display: inline'>Content 1</p><p id='id2'>Content 2</p><p id='id3'>Content 3</p>");
+
+    final GQuery sectA = $("#id1");
+    final GQuery sectB = $("#id2");
+    final GQuery sectC = $("#id3");
+    
+    // hide()
+    sectA.hide();
+    assertEquals("none", sectA.css("display"));
+    sectB.hide();
+    assertEquals("none", sectB.css("display"));
+    
+    // show()
+    sectA.show();
+    assertEquals("inline", sectA.css("display"));
+    sectB.show();
+    assertEquals("", sectB.css("display"));
+    
+    // toggle()
+    assertEquals("", sectC.css("display"));
+    sectC.toggle();
+    assertEquals("none", sectC.css("display"));
+    sectC.toggle();
+    assertEquals("block", sectC.css("display"));
+  }
   
   public void testSliceMethods() {
     String content = "<p>This is just a test.</p><p>So is this</p>";
@@ -558,7 +602,7 @@ public class GQueryCoreTest extends GWTTestCase {
     assertEquals(2, $("p", e).slice(0, -1).size());
     assertEquals(0, $("p", e).slice(3, 2).size());
   }
-
+  
   public void testUnique() {
     SelectorEngineImpl selSizz = new SelectorEngineSizzle();
     GQuery g = $(e).html("<div><p></p><p></p><span></span><p></p>");
@@ -572,6 +616,61 @@ public class GQueryCoreTest extends GWTTestCase {
     assertEquals(3, a.getLength());
   }
   
+  public void testUtilsEq() {
+    assertTrue(GQUtils.eq("a", "a"));
+    assertTrue(GQUtils.eq(true, true));
+    assertTrue(GQUtils.eq(45, 45));
+    assertTrue(GQUtils.eq(45d, 45f));
+    assertTrue(GQUtils.eq("", ""));
+    assertTrue(GQUtils.eq(0.45, 0.45));
+    assertTrue(GQUtils.eq(0.45d, 0.45d));
+    assertTrue(GQUtils.eq(0.45f, 0.45f));
+    
+    assertFalse(GQUtils.eq("a", ""));
+    assertFalse(GQUtils.eq(true, false));
+    assertFalse(GQUtils.eq(45, 42));
+    assertFalse(GQUtils.eq("", null));
+    assertFalse(GQUtils.eq(0.45, 0.451));
+  }
+  
+  public void testUtilsTruth() {
+    assertTrue(GQUtils.truth("a"));
+    assertTrue(GQUtils.truth(this));
+    assertTrue(GQUtils.truth(45));
+    assertTrue(GQUtils.truth(0.33));
+    assertTrue(GQUtils.truth(45l));
+    assertTrue(GQUtils.truth(45d));
+    assertTrue(GQUtils.truth(45f));
+    assertTrue(GQUtils.truth(0.33f));
+
+    assertFalse(GQUtils.truth(0));
+    assertFalse(GQUtils.truth(0l));
+    assertFalse(GQUtils.truth(0d));
+    assertFalse(GQUtils.truth(00.00d));
+    assertFalse(GQUtils.truth(00.00f));
+    assertFalse(GQUtils.truth(null));
+    assertFalse(GQUtils.truth(""));
+  }
+  
+  public void testWidthHeight() {
+    $(e)
+    .html(
+        "<div style='border: 1px solid red; padding: 10px; width: 100px; height: 100px'>Content 1</div>");
+    GQuery g = $("div", e);
+    assertEquals(120, g.width());
+    assertEquals(122, g.height());
+    assertEquals(120, g.clientWidth());
+    assertEquals(120, g.clientHeight());
+    assertEquals(100, (int)GQUtils.cur(g.get(0), "width", false));
+    assertEquals(100, (int)GQUtils.cur(g.get(0), "height", false));
+    assertEquals(100, (int)GQUtils.cur(g.get(0), "width", true));
+    assertEquals(100, (int)GQUtils.cur(g.get(0), "height", true));
+    assertEquals("100", g.css("width"));
+    assertEquals("100", g.css("height"));
+    assertEquals("100px", g.get(0).getStyle().getProperty("width"));
+    assertEquals("100px", g.get(0).getStyle().getProperty("height"));
+  }
+  
   public void testWrapMethod() {
     String content = "<p>Test Paragraph.</p>";
     String wrapper = "<div id=\"content\">Content</div>";
@@ -588,47 +687,4 @@ public class GQueryCoreTest extends GWTTestCase {
     assertHtmlEquals(expected, $(e).html());
   }
   
-  public void testShowHide() {
-    $(e)
-    .html(
-        "<p id='id1' style='display: inline'>Content 1</p><p id='id2'>Content 2</p><p id='id3'>Content 3</p>");
-
-    final GQuery sectA = $("#id1");
-    final GQuery sectB = $("#id2");
-    final GQuery sectC = $("#id3");
-    
-    // hide()
-    sectA.hide();
-    assertEquals("none", sectA.css("display"));
-    sectB.hide();
-    assertEquals("none", sectB.css("display"));
-    
-    // show()
-    sectA.show();
-    assertEquals("inline", sectA.css("display"));
-    sectB.show();
-    assertEquals("", sectB.css("display"));
-    
-    // toggle()
-    assertEquals("", sectC.css("display"));
-    sectC.toggle();
-    assertEquals("none", sectC.css("display"));
-    sectC.toggle();
-    assertEquals("block", sectC.css("display"));
-  }
-  
-  public void testWidthHeight() {
-    $(e)
-    .html(
-        "<div style='border: 1px solid red; padding: 10px; width: 100px; height: 100px'>Content 1</div>");
-    GQuery g = $("div", e);
-    assertEquals(120, g.width());
-    assertEquals(122, g.height());
-    assertEquals(120, g.clientWidth());
-    assertEquals(120, g.clientHeight());
-    assertEquals(100, (int)GQuery.cur(g.get(0), "width"));
-    assertEquals(100, (int)GQuery.cur(g.get(0), "height"));
-    assertEquals("100px", g.css("width"));
-    assertEquals("100px", g.css("height"));
-  }
 }
diff --git a/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryEffectsTest.java b/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryEffectsTest.java
index b7745529..7992136e 100644
--- a/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryEffectsTest.java
+++ b/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryEffectsTest.java
@@ -22,7 +22,7 @@ import com.google.gwt.dom.client.Element;
 import com.google.gwt.junit.client.GWTTestCase;
 import com.google.gwt.query.client.GQuery.Offset;
 import com.google.gwt.query.client.plugins.Effects;
-import com.google.gwt.query.client.plugins.ClipAnimation.Action;
+import com.google.gwt.query.client.plugins.PropertiesAnimation;
 import com.google.gwt.query.client.plugins.PropertiesAnimation.Easing;
 import com.google.gwt.user.client.Timer;
 import com.google.gwt.user.client.ui.HTML;
@@ -52,64 +52,47 @@ public class GQueryEffectsTest extends GWTTestCase {
     }
   }
 
-  public void testFade() {
-    $(e)
-    .html(
-        "<p id='id1' style='display: inline'>Content 1</p><p id='id2'>Content 2</p><p id='id3'>Content 3</p>");
-
-    final GQuery sectA = $("#id1");
-    final GQuery sectB = $("#id2");
+  public void testClipAnimation() {
+    $(e).html("<p id='idtest'>Content 1</p></p>");
     
-    // fadeIn() & fadeOut() are tested with delayed assertions
-    sectA.hide();
-    sectA.fadeIn(2000);
-    sectB.fadeOut(2000);
+    final GQuery g = $("#idtest");
+    final int duration = 800;
+    
+    // Clip effect places a relative div in the position of the original element
+    // So check that there is not any div.
+    GQuery back = $("div", e);
+    assertEquals(0, back.size());
 
-    // Configure the max duration for this test
-    // If the test exceeds the timeout without calling finishTest() it will fail
-    delayTestFinish(2500);
+    g.as(Effects.Effects).clipDisappear(duration);
 
-    // Delayed assertions at different intervals
-    Timer timerShortTime = new Timer() {
-      public void run() {
-        double o = Double.valueOf(sectA.css("opacity"));
-        assertTrue(
-            "'sectA' opacity must be in the interval 0-0.5 but is: " + o, o > 0
-                && o < 0.5);
-        o = Double.valueOf(sectB.css("opacity"));
-        assertTrue(
-            "'sectB' opacity must be in the interval 0.5-1 but is: " + o,
-            o > 0.5 && o < 1);
-      }
-    };
-    Timer timerMidTime = new Timer() {
+    // Check that the back div has been created
+    back = $("div", e);
+    assertEquals(1, back.size());
+    
+    // Configure the max duration for this test
+    delayTestFinish(duration * 2);
+    
+    // each timer calls the next one
+    final Timer timer1 = new Timer() {
       public void run() {
-        assertEquals("inline", sectA.css("display"));
-        assertEquals("", sectB.css("display"));
-        double o = Double.valueOf(sectA.css("opacity"));
-        assertTrue(
-            "'sectA' opacity must be in the interval 0.5-1 but is: " + o,
-            o > 0.5 && o < 1);
-        o = Double.valueOf(sectB.css("opacity"));
-        assertTrue(
-            "'sectB' opacity must be in the interval 0-0.5 but is: " + o, o > 0
-                && o < 0.5);
+        // Check that the back div has been removed
+        GQuery back = $("div", e);
+        assertEquals(0, back.size());
+        // Check that the attribute clip has been removed
+        assertEquals("", g.css("clip"));
+        finishTest();
       }
     };
-    Timer timerLongTime = new Timer() {
+    final Timer timer2 = new Timer() {
       public void run() {
-        assertEquals("inline", sectA.css("display"));
-        assertEquals("none", sectB.css("display"));
-        // Last delayed assertion has to stop the test to avoid a timeout
-        // failure
-        finishTest();
+        // Check that the attribute clip has been set
+        assertTrue(g.css("clip").matches("rect\\(\\d+px[, ]+\\d+px[, ]+\\d+px[, ]+\\d+px\\)"));
+        timer1.schedule(duration/2 + 1);
       }
     };
-
-    // schedule the delayed assertions
-    timerShortTime.schedule(200);
-    timerMidTime.schedule(1200);
-    timerLongTime.schedule(2200);    
+    
+    // Start the first timer
+    timer2.schedule(duration/2);
   }  
 
   public void testEffectsShouldBeQueued() {
@@ -154,53 +137,153 @@ public class GQueryEffectsTest extends GWTTestCase {
         timer3.schedule(duration);
       }
     };
-    // Starts the first timer
+    // Start the first timer
     timer4.schedule(duration/2);
   }
   
-  public void testClipAnimation() {
-    $(e).html("<p id='idtest'>Content 1</p></p>");
-    
-    final GQuery g = $("#idtest");
-    final int duration = 800;
-    
-    // Clip effect paces a relative div in the position of the original element
-    // So check that there is not any div.
-    GQuery back = $("div", e);
-    assertEquals(0, back.size());
-
-    g.as(Effects.Effects).clipDisappear(duration);
+  public void testFade() {
+    $(e)
+    .html(
+        "<p id='id1' style='display: inline'>Content 1</p><p id='id2'>Content 2</p><p id='id3'>Content 3</p>");
 
-    // Check that the back div has been created
-    back = $("div", e);
-    assertEquals(1, back.size());
+    final GQuery sectA = $("#id1");
+    final GQuery sectB = $("#id2");
     
+    // fadeIn() & fadeOut() are tested with delayed assertions
+    sectA.hide();
+    sectA.fadeIn(2000);
+    sectB.fadeOut(2000);
+
     // Configure the max duration for this test
-    delayTestFinish(duration * 2);
-    
-    // each timer calls the next one
-    final Timer timer1 = new Timer() {
+    // If the test exceeds the timeout without calling finishTest() it will fail
+    delayTestFinish(2500);
+
+    // Delayed assertions at different intervals
+    Timer timerShortTime = new Timer() {
       public void run() {
-        // Check that the back div has been removed
-        GQuery back = $("div", e);
-        assertEquals(0, back.size());
-        // Check that the attribute clip has been removed
-        assertEquals("", g.css("clip"));
-        finishTest();
+        double o = Double.valueOf(sectA.css("opacity"));
+        assertTrue(
+            "'sectA' opacity must be in the interval 0-0.5 but is: " + o, o > 0
+                && o < 0.5);
+        o = Double.valueOf(sectB.css("opacity"));
+        assertTrue(
+            "'sectB' opacity must be in the interval 0.5-1 but is: " + o,
+            o > 0.5 && o < 1);
       }
     };
-    final Timer timer2 = new Timer() {
+    Timer timerMidTime = new Timer() {
       public void run() {
-        // Check that the attribute clip has been set
-        assertTrue(g.css("clip").matches("rect\\(\\d+px[, ]+\\d+px[, ]+\\d+px[, ]+\\d+px\\)"));
-        timer1.schedule(duration/2 + 1);
+        assertEquals("inline", sectA.css("display"));
+        assertEquals("", sectB.css("display"));
+        double o = Double.valueOf(sectA.css("opacity"));
+        assertTrue(
+            "'sectA' opacity must be in the interval 0.5-1 but is: " + o,
+            o > 0.5 && o < 1);
+        o = Double.valueOf(sectB.css("opacity"));
+        assertTrue(
+            "'sectB' opacity must be in the interval 0-0.5 but is: " + o, o > 0
+                && o < 0.5);
       }
     };
-    
-    // Start the first timer
-    timer2.schedule(duration/2);
+    Timer timerLongTime = new Timer() {
+      public void run() {
+        assertEquals("inline", sectA.css("display"));
+        assertEquals("none", sectB.css("display"));
+        // Last delayed assertion has to stop the test to avoid a timeout
+        // failure
+        finishTest();
+      }
+    };
+
+    // schedule the delayed assertions
+    timerShortTime.schedule(200);
+    timerMidTime.schedule(1200);
+    timerLongTime.schedule(2200);    
   }
 
+  public void testPropertiesAnimationComputeEffects() {
+    $(e)
+        .html(
+            "<div id='parent' style='background-color: yellow; width: 100px; height: 200px; top:130px; position: absolute; left: 130px'><p id='child' style='background-color: pink; width: 100px; height: 100px; position: absolute; padding: 5px; margin: 0px'>Content 1</p></div>");
+    GQuery g = $("#child");
+    Properties prop1;
+
+    assertEquals("attr=marginTop value=-110px start=0 end=-110 unit=px",
+        PropertiesAnimation.computeFxProp(g.get(0), "marginTop", "-110px",
+            false).toString());
+    assertEquals("attr=marginLeft value=-110px start=0 end=-110 unit=px",
+        PropertiesAnimation.computeFxProp(g.get(0), "marginLeft", "-110px",
+            false).toString());
+    assertEquals("attr=top value=50% start=0 end=50 unit=%",
+        PropertiesAnimation.computeFxProp(g.get(0), "top", "50%", false)
+            .toString());
+    assertEquals("attr=left value=50% start=0 end=50 unit=%",
+        PropertiesAnimation.computeFxProp(g.get(0), "left", "50%", false)
+            .toString());
+    assertEquals("attr=width value=174px start=100 end=174 unit=px",
+        PropertiesAnimation.computeFxProp(g.get(0), "width", "174px", false)
+            .toString());
+    assertEquals("attr=height value=174px start=100 end=174 unit=px",
+        PropertiesAnimation.computeFxProp(g.get(0), "height", "174px", false)
+            .toString());
+    assertEquals("attr=padding value=20px start=5 end=20 unit=px",
+        PropertiesAnimation.computeFxProp(g.get(0), "padding", "20px", false)
+            .toString());
+
+    prop1 = GQuery.$$("marginTop: '-110px', marginLeft: '-110px', top: '50%', left: '50%', width: '174px', height: '174px', padding: '20px'");
+    PropertiesAnimation an = new PropertiesAnimation(Easing.SWING, g.get(0), prop1);
+    an.onStart();
+    an.onComplete();
+
+    assertEquals("attr=marginTop value=0 start=-110 end=0 unit=px",
+        PropertiesAnimation.computeFxProp(g.get(0), "marginTop", "0", false)
+            .toString());
+    assertEquals("attr=marginLeft value=0 start=-110 end=0 unit=px",
+        PropertiesAnimation.computeFxProp(g.get(0), "marginLeft", "0", false)
+            .toString());
+    assertEquals("attr=top value=0% start=50 end=0 unit=%", PropertiesAnimation
+        .computeFxProp(g.get(0), "top", "0%", false).toString());
+    assertEquals("attr=left value=0% start=50 end=0 unit=%",
+        PropertiesAnimation.computeFxProp(g.get(0), "left", "0%", false)
+            .toString());
+    assertEquals("attr=width value=100px start=174 end=100 unit=px",
+        PropertiesAnimation.computeFxProp(g.get(0), "width", "100px", false)
+            .toString());
+    assertEquals("attr=height value=100px start=174 end=100 unit=px",
+        PropertiesAnimation.computeFxProp(g.get(0), "height", "100px", false)
+            .toString());
+    assertEquals("attr=padding value=5px start=20 end=5 unit=px",
+        PropertiesAnimation.computeFxProp(g.get(0), "padding", "5px", false)
+            .toString());
+
+    prop1 = GQuery.$$("marginTop: '0', marginLeft: '0', top: '0%', left: '0%', width: '100px', height: '100px', padding: '5px'");
+    an = new PropertiesAnimation(Easing.SWING, g.get(0), prop1);
+    an.onStart();
+    an.onComplete();
+
+    assertEquals("attr=marginTop value=-110px start=0 end=-110 unit=px",
+        PropertiesAnimation.computeFxProp(g.get(0), "marginTop", "-110px",
+            false).toString());
+    assertEquals("attr=marginLeft value=-110px start=0 end=-110 unit=px",
+        PropertiesAnimation.computeFxProp(g.get(0), "marginLeft", "-110px",
+            false).toString());
+    assertEquals("attr=top value=50% start=0 end=50 unit=%",
+        PropertiesAnimation.computeFxProp(g.get(0), "top", "50%", false)
+            .toString());
+    assertEquals("attr=left value=50% start=0 end=50 unit=%",
+        PropertiesAnimation.computeFxProp(g.get(0), "left", "50%", false)
+            .toString());
+    assertEquals("attr=width value=174px start=100 end=174 unit=px",
+        PropertiesAnimation.computeFxProp(g.get(0), "width", "174px", false)
+            .toString());
+    assertEquals("attr=height value=174px start=100 end=174 unit=px",
+        PropertiesAnimation.computeFxProp(g.get(0), "height", "174px", false)
+            .toString());
+    assertEquals("attr=padding value=20px start=5 end=20 unit=px",
+        PropertiesAnimation.computeFxProp(g.get(0), "padding", "20px", false)
+            .toString());
+  }
+  
   private void assertPosition(GQuery g, Offset min, Offset max) {
     int a = Math.min(min.top, max.top);
     int b = Math.max(min.top, max.top);
diff --git a/gwtquery-core/src/test/java/com/google/gwt/query/client/GQuerySelectorsTest.java b/gwtquery-core/src/test/java/com/google/gwt/query/client/GQuerySelectorsTest.java
index 33bc316b..b30d12c1 100644
--- a/gwtquery-core/src/test/java/com/google/gwt/query/client/GQuerySelectorsTest.java
+++ b/gwtquery-core/src/test/java/com/google/gwt/query/client/GQuerySelectorsTest.java
@@ -305,11 +305,10 @@ public class GQuerySelectorsTest extends GWTTestCase {
       a.push(a.get(i));
     }
     assertEquals(n * 2 , a.length());
-    a = SelectorEngineImpl.unique(a);
+    a = GQUtils.unique(a);
     assertEquals(n, a.length());
   }
   
-  
   private void assertArrayContains(Object result, Object... array) {
     assertArrayContains("", result, array);
   }