Skip to content

Commit

Permalink
Fix type-of function reporting color for strings
Browse files Browse the repository at this point in the history
Fixes sass#1281
  • Loading branch information
mgreter committed Jun 18, 2015
1 parent a262eed commit 289fe46
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions functions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@ namespace Sass {
Expression* exp = ARG(argname, Expression);
string exp_src = exp->perform(&to_string) + "{";
Selector_List* sel_list = Parser::parse_selector(exp_src.c_str(), ctx);

return (sel_list->length() > 0) ? sel_list->first()->tail()->head() : 0;
}

Expand Down Expand Up @@ -1400,9 +1399,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());
}
Expand Down

0 comments on commit 289fe46

Please sign in to comment.