From c891262e2cc988727bd92e9dd89339d6bf99662e Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Wed, 26 May 2010 12:55:49 +0000 Subject: [PATCH] Made CSSRule "deep" parameter actually work. svn changeset:13377/svn branch:6.4 --- src/com/vaadin/terminal/gwt/client/CSSRule.java | 4 ++-- 1 file 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); } } -- 2.39.5