aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManolo Carrasco <manolo@apache.org>2012-10-17 09:01:58 +0200
committerManolo Carrasco <manolo@apache.org>2012-10-17 09:01:58 +0200
commita854153fedef67b47ecbf24d1d9d1f9c90a19c5e (patch)
tree32d0b474926c0d5fd03e3a580083ac7faff5209c
parentae3821f146a28f63a175267ac056972b23186b27 (diff)
parentbb6cabf555b192aeabdcfc28c114fadb5c7fe612 (diff)
downloadgwtquery-a854153fedef67b47ecbf24d1d9d1f9c90a19c5e.tar.gz
gwtquery-a854153fedef67b47ecbf24d1d9d1f9c90a19c5e.zip
Merge branch 'master' of github.com:gwtquery/gwtquery
-rw-r--r--gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java12
1 files changed, 6 insertions, 6 deletions
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 ce90db38..ec453c4d 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
@@ -15,11 +15,6 @@ package com.google.gwt.query.client;
import static com.google.gwt.query.client.plugins.QueuePlugin.Queue;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
import com.google.gwt.core.client.GWT;
import com.google.gwt.core.client.JavaScriptObject;
import com.google.gwt.core.client.JsArray;
@@ -66,6 +61,11 @@ import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.GqUi;
import com.google.gwt.user.client.ui.Widget;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
/**
* GwtQuery is a GWT clone of the popular jQuery library.
*/
@@ -2301,7 +2301,7 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
for (Element e : elements) {
String currentDisplay = getStyleImpl().curCSS(e, "display", false);
Object old = data(e, OLD_DISPLAY, null);
- if (old == null && !currentDisplay.matches("(|none)")) {
+ if (old == null && currentDisplay.length() != 0 && !"none".equals(currentDisplay)) {
data(e, OLD_DISPLAY, currentDisplay);
}
}