aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Koivuviita <jouni.koivuviita@itmill.com>2010-05-26 12:55:49 +0000
committerJouni Koivuviita <jouni.koivuviita@itmill.com>2010-05-26 12:55:49 +0000
commitc891262e2cc988727bd92e9dd89339d6bf99662e (patch)
treec57c8e6486e6d537afcb3c61a911ea4c81a49ec0
parent3735511b23471975369c466bb810e686ee04811b (diff)
downloadvaadin-framework-c891262e2cc988727bd92e9dd89339d6bf99662e.tar.gz
vaadin-framework-c891262e2cc988727bd92e9dd89339d6bf99662e.zip
Made CSSRule "deep" parameter actually work.
svn changeset:13377/svn branch:6.4
-rw-r--r--src/com/vaadin/terminal/gwt/client/CSSRule.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/CSSRule.java b/src/com/vaadin/terminal/gwt/client/CSSRule.java
index c3cebaba6b..0931c23d86 100644
--- a/src/com/vaadin/terminal/gwt/client/CSSRule.java
+++ b/src/com/vaadin/terminal/gwt/client/CSSRule.java
@@ -54,7 +54,7 @@ public class CSSRule {
var allMatches = [];
// IE handles imported sheet differently
- if(deep && sheet.imports.length > 0) {
+ if(deep && sheet.imports && sheet.imports.length > 0) {
for(var i=0; i < sheet.imports.length; i++) {
var imports = @com.vaadin.terminal.gwt.client.CSSRule::searchForRule(Lcom/google/gwt/core/client/JavaScriptObject;Ljava/lang/String;Z)(sheet.imports[i], selector, deep);
allMatches.concat(imports);
@@ -82,7 +82,7 @@ public class CSSRule {
} else if(deep && r.type == 3) {
// Search @import stylesheet
var imports = @com.vaadin.terminal.gwt.client.CSSRule::searchForRule(Lcom/google/gwt/core/client/JavaScriptObject;Ljava/lang/String;Z)(r.styleSheet, selector, deep);
- allMatches.concat(imports);
+ allMatches = allMatches.concat(imports);
}
}