summaryrefslogtreecommitdiff
path: root/src/parse/properties
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2009-07-07 23:48:06 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2009-07-07 23:48:06 +0000
commitcee938cf367907c0e805efc15fd13c54175c9f98 (patch)
tree73591a62bd9c0cd904c8b9b42c1f1b99e34c3d44 /src/parse/properties
parentf49b6dbd5b5428afda1cd3ea9694375c875db7aa (diff)
downloadlibcss-cee938cf367907c0e805efc15fd13c54175c9f98.tar.gz
libcss-cee938cf367907c0e805efc15fd13c54175c9f98.tar.bz2
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
Diffstat (limited to 'src/parse/properties')
-rw-r--r--src/parse/properties/generated_list.c10
1 files 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) {