From 044fa4167edf5d0f48357679712eefda5602d6f9 Mon Sep 17 00:00:00 2001 From: Marc Englund Date: Wed, 21 Nov 2012 17:03:08 +0200 Subject: Fixes #10308 (parent reference & causes non-parent selectors to be dropped) Change-Id: I4821d14b4dc2a9e83e6fbfba67d39e0e3e98970f --- .../src/com/vaadin/sass/visitor/ParentSelectorHandler.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'theme-compiler/src') diff --git a/theme-compiler/src/com/vaadin/sass/visitor/ParentSelectorHandler.java b/theme-compiler/src/com/vaadin/sass/visitor/ParentSelectorHandler.java index cb7b0ac8a8..6b5c5538a4 100644 --- a/theme-compiler/src/com/vaadin/sass/visitor/ParentSelectorHandler.java +++ b/theme-compiler/src/com/vaadin/sass/visitor/ParentSelectorHandler.java @@ -32,18 +32,16 @@ public class ParentSelectorHandler { ArrayList newList = new ArrayList(block .getSelectorList().size()); BlockNode parentBlock = (BlockNode) parentNode; - for (final String s : block.getSelectorList()) { - - if (s.contains("&")) { - for (final String parentSelector : parentBlock - .getSelectorList()) { + for (final String parentSelector : parentBlock.getSelectorList()) { + for (final String s : block.getSelectorList()) { + if (s.contains("&")) { newList.add(s.replace("&", parentSelector)); isParentSelector = true; + } else { + newList.add(parentSelector + " " + s); } - } } - if (isParentSelector) { block.setSelectorList(newList); Node oldparent = block.getParentNode(); -- cgit v1.2.3