From cee938cf367907c0e805efc15fd13c54175c9f98 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Tue, 7 Jul 2009 23:48:06 +0000 Subject: Make list-style shorthand parser attempt to parse a list-style-type value before anything else. This way, list-style: none will do the right thing as list-style-image defaults to none, anyway. svn path=/trunk/libcss/; revision=8385 --- src/parse/properties/generated_list.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/parse/properties/generated_list.c b/src/parse/properties/generated_list.c index 3efe305..0d9dd7c 100644 --- a/src/parse/properties/generated_list.c +++ b/src/parse/properties/generated_list.c @@ -247,14 +247,14 @@ css_error parse_list_style(css_language *c, goto cleanup; } - if (image == NULL && (error = parse_list_style_image(c, vector, - ctx, &image)) == CSS_OK) { + if (type == NULL && (error = parse_list_style_type(c, vector, + ctx, &type)) == CSS_OK) { } else if (position == NULL && (error = parse_list_style_position(c, vector, ctx, &position)) == CSS_OK) { - } else if (type == NULL && - (error = parse_list_style_type(c, vector, ctx, - &type)) == CSS_OK) { + } else if (image == NULL && + (error = parse_list_style_image(c, vector, ctx, + &image)) == CSS_OK) { } if (error == CSS_OK) { -- cgit v1.2.3