Fix type-of function reporting color for strings

Fixes sass#1281
mgreter · Jun 30, 2015 · d21495e · d21495e
1 parent 1bf5b7e
commit d21495e
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/functions.cpp b/functions.cpp
@@ -818,7 +818,7 @@ namespace Sass {
         error(msg, pstate, backtrace);
       }
       catch (...) { throw; }
-      // return something even if we had an error (-1)
+      // handle any invalid utf8 errors
       return new (ctx.mem) Number(pstate, len);
     }
 
@@ -909,7 +909,7 @@ namespace Sass {
         error(msg, pstate, backtrace);
       }
       catch (...) { throw; }
-      // return something even if we had an error (-1)
+      // handle any invalid utf8 errors
       return new (ctx.mem) Number(pstate, index);
     }
 
@@ -1379,9 +1379,6 @@ namespace Sass {
       if (v->concrete_type() == Expression::STRING) {
         To_String to_string(&ctx);
         string str(v->perform(&to_string));
-        if (ctx.names_to_colors.count(str)) {
-          return new (ctx.mem) String_Constant(pstate, "color");
-        }
       }
       return new (ctx.mem) String_Constant(pstate, ARG("$value", Expression)->type());
     }