diff options
| author | Marc Englund <marc@vaadin.com> | 2012-11-20 14:19:47 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2012-11-20 14:19:47 +0000 |
| commit | d00c06a5801c5e1a1b5b2627805180490e1b191b (patch) | |
| tree | e8a5788daec7d41a00bc05296251defd7ea5089f /theme-compiler/src | |
| parent | 6d2f957ef989ab36d80c7e4a6fbb13380d9f1265 (diff) | |
| parent | 0bfa96ee1e05ad0867eb22e05a44e3a4290ec586 (diff) | |
| download | vaadin-framework-d00c06a5801c5e1a1b5b2627805180490e1b191b.tar.gz vaadin-framework-d00c06a5801c5e1a1b5b2627805180490e1b191b.zip | |
Merge "(#10174) Value of a variable cannot be assigned to another variable"
Diffstat (limited to 'theme-compiler/src')
| -rw-r--r-- | theme-compiler/src/com/vaadin/sass/tree/VariableNode.java | 2 | ||||
| -rw-r--r-- | theme-compiler/src/com/vaadin/sass/visitor/MixinNodeHandler.java | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/theme-compiler/src/com/vaadin/sass/tree/VariableNode.java b/theme-compiler/src/com/vaadin/sass/tree/VariableNode.java index 3ea8379829..89cab33129 100644 --- a/theme-compiler/src/com/vaadin/sass/tree/VariableNode.java +++ b/theme-compiler/src/com/vaadin/sass/tree/VariableNode.java @@ -77,6 +77,8 @@ public class VariableNode extends Node implements IVariableNode { && expr.getParameters().toString() .contains("$" + node.getName())) { replaceValues(expr.getParameters(), node); + } else if (expr.getLexicalUnitType() == LexicalUnitImpl.SCSS_VARIABLE) { + replaceValues(expr, node); } } } diff --git a/theme-compiler/src/com/vaadin/sass/visitor/MixinNodeHandler.java b/theme-compiler/src/com/vaadin/sass/visitor/MixinNodeHandler.java index 3c31ee1073..4875a39b1d 100644 --- a/theme-compiler/src/com/vaadin/sass/visitor/MixinNodeHandler.java +++ b/theme-compiler/src/com/vaadin/sass/visitor/MixinNodeHandler.java @@ -48,6 +48,7 @@ public class MixinNodeHandler { Node pre = mixinNode; MixinDefNode defClone = (MixinDefNode) DeepCopy.copy(mixinDef); + defClone.traverse(); if (mixinDef.getArglist().isEmpty()) { for (Node child : new ArrayList<Node>(defClone.getChildren())) { |