diff options
| -rw-r--r-- | archetype/pom.xml | 2 | ||||
| -rw-r--r-- | archetype/src/main/resources/archetype-resources/pom.xml | 2 | ||||
| -rw-r--r-- | devtest/pom.xml | 2 | ||||
| -rw-r--r-- | gwtquery-core/pom.xml | 4 | ||||
| -rwxr-xr-x | gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/effects/TransitionsAnimation.java | 12 | ||||
| -rw-r--r-- | gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryEffectsTestGwt.java | 12 | ||||
| -rw-r--r-- | jsquery/pom.xml | 2 | ||||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | samples/pom.xml | 2 |
9 files changed, 30 insertions, 10 deletions
diff --git a/archetype/pom.xml b/archetype/pom.xml index 94d53b52..aeefd7c9 100644 --- a/archetype/pom.xml +++ b/archetype/pom.xml @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.gwtquery</groupId> <artifactId>gquery-archetype</artifactId> - <version>1.4.1-SNAPSHOT</version> + <version>1.4.1</version> <packaging>maven-archetype</packaging> <name>GwtQuery Archetype</name> diff --git a/archetype/src/main/resources/archetype-resources/pom.xml b/archetype/src/main/resources/archetype-resources/pom.xml index f61084a9..da695ebf 100644 --- a/archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetype/src/main/resources/archetype-resources/pom.xml @@ -12,7 +12,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <maven.compiler.source>1.6</maven.compiler.source> <maven.compiler.target>1.6</maven.compiler.target> - <gQueryVersion>1.4.1-SNAPSHOT</gQueryVersion> + <gQueryVersion>1.4.1</gQueryVersion> <gwtversion>2.5.1</gwtversion> <gwtmaven>2.5.1</gwtmaven> </properties> diff --git a/devtest/pom.xml b/devtest/pom.xml index 64ec23e6..4da27e99 100644 --- a/devtest/pom.xml +++ b/devtest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>com.googlecode.gwtquery</groupId> <artifactId>gwtquery-project</artifactId> - <version>1.4.1-SNAPSHOT</version> + <version>1.4.1</version> </parent> <artifactId>devtest</artifactId> diff --git a/gwtquery-core/pom.xml b/gwtquery-core/pom.xml index 1514e2e5..31aede2d 100644 --- a/gwtquery-core/pom.xml +++ b/gwtquery-core/pom.xml @@ -3,12 +3,12 @@ <parent> <groupId>com.googlecode.gwtquery</groupId> <artifactId>gwtquery-project</artifactId> - <version>1.4.1-SNAPSHOT</version> + <version>1.4.1</version> </parent> <artifactId>gwtquery</artifactId> <packaging>jar</packaging> - <version>1.4.1-SNAPSHOT</version> + <version>1.4.1</version> <name>Gwt Query Core API</name> <url>http://gquery.org</url> <dependencies> diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/effects/TransitionsAnimation.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/effects/TransitionsAnimation.java index 74353323..df3da8f3 100755 --- a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/effects/TransitionsAnimation.java +++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/effects/TransitionsAnimation.java @@ -162,9 +162,17 @@ public class TransitionsAnimation extends PropertiesAnimation { if (part1 != null && !part1.isEmpty()) { double n = "-=".equals(part1) ? -1 : 1; - double st = Double.parseDouble(trsStart); + + double st = 0; + MatchResult sparts = REGEX_SYMBOL_NUMBER_UNIT.exec(trsStart); + if (sparts != null) { + st = Double.parseDouble(sparts.getGroup(2)); + unit = sparts.getGroup(3).isEmpty() ? unit : sparts.getGroup(3); + } + trsStart = "" + st + unit; + double en = Double.parseDouble(trsEnd); - trsEnd = "" + (st + (n*en)); + trsEnd = "" + (st + n*en) + unit; } // Deal with non px units like "%" diff --git a/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryEffectsTestGwt.java b/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryEffectsTestGwt.java index ac79febe..11669ba4 100644 --- a/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryEffectsTestGwt.java +++ b/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryEffectsTestGwt.java @@ -23,8 +23,10 @@ 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.Fx.ColorFx; +import com.google.gwt.query.client.plugins.effects.Fx.TransitFx; import com.google.gwt.query.client.plugins.effects.PropertiesAnimation; import com.google.gwt.query.client.plugins.effects.PropertiesAnimation.EasingCurve; +import com.google.gwt.query.client.plugins.effects.TransitionsAnimation; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.Label; @@ -369,6 +371,16 @@ public class GQueryEffectsTestGwt extends GWTTestCase { }; timer.schedule(duration * 2); } + + public void testComputeFxPropTransitions() { + $(e).html("<table border=1 id=idtest><tr><td width=200px>A</td><td width=100px>B</td></tr></table>"); + $("#idtest").css("position", "absolute").find("td"); + final GQuery g = $("#idtest td"); + + TransitFx fx = (TransitFx)TransitionsAnimation.computeFxProp(g.get(0), "width", "+=100", false); + assertEquals("10px", fx.transitStart.replace(".0","")); + assertEquals("110px", fx.transitEnd.replace(".0","")); + } public void testStop() { $(e) diff --git a/jsquery/pom.xml b/jsquery/pom.xml index 6feb3851..d71041cf 100644 --- a/jsquery/pom.xml +++ b/jsquery/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>com.googlecode.gwtquery</groupId> <artifactId>gwtquery-project</artifactId> - <version>1.4.1-SNAPSHOT</version> + <version>1.4.1</version> </parent> <name>JsQuery</name> @@ -3,7 +3,7 @@ <groupId>com.googlecode.gwtquery</groupId> <artifactId>gwtquery-project</artifactId> <packaging>pom</packaging> - <version>1.4.1-SNAPSHOT</version> + <version>1.4.1</version> <name>Gwt Query Project</name> <url>http://gwtquery.com</url> <description>GwtQuery is a jQuery clone written in GWT.</description> diff --git a/samples/pom.xml b/samples/pom.xml index 18c15f14..c648e28b 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>com.googlecode.gwtquery</groupId> <artifactId>gwtquery-project</artifactId> - <version>1.4.1-SNAPSHOT</version> + <version>1.4.1</version> </parent> <name>GwtQuery Samples</name> |