Merge branch 'bug/coercion'

disfated · Dec 7, 2011 · 8b87161 · 8b87161
2 parents b29396a + a819d85
commit 8b87161
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/lib/nodes/unit.js b/lib/nodes/unit.js
@@ -83,7 +83,7 @@ Unit.prototype.clone = function(){
  */
 
 Unit.prototype.operate = function(op, right){
-  var type = this.type || right.type;
+  var type = this.type || right.first.type;
 
   // swap color
   if ('rgba' == right.nodeName || 'hsla' == right.nodeName) {

diff --git a/test/cases/regression.480.css b/test/cases/regression.480.css
@@ -0,0 +1,9 @@
+body {
+  foo: 25px;
+  foo: 25px;
+}
+body {
+  foo: 10em;
+  foo: 10em;
+  foo: 10px;
+}
diff --git a/test/cases/regression.480.styl b/test/cases/regression.480.styl
@@ -0,0 +1,12 @@
+n = 5px
+
+body
+  foo: n * 5
+  foo: 5 * n
+
+n = 5em 5px 5
+
+body
+  foo: n * 2
+  foo: 2 * n
+  foo: 2px * n