mirror of
https://github.com/rkd77/elinks.git
synced 2025-02-02 15:09:23 -05:00
Fix text node appending; fix DOM configuration parser
This commit is contained in:
parent
fe43bf8a4f
commit
7fe214fbb2
@ -184,14 +184,13 @@ dom_normalize_node_end(struct dom_stack *stack, struct dom_node *node, void *dat
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case DOM_NODE_TEXT:
|
case DOM_NODE_TEXT:
|
||||||
if (config->flags & DOM_CONFIG_NORMALIZE_CHARACTERS) {
|
if (!(config->flags & DOM_CONFIG_ELEMENT_CONTENT_WHITESPACE)
|
||||||
code = append_node_text(config, node);
|
&& node->data.text.only_space) {
|
||||||
|
|
||||||
} else if (!(config->flags & DOM_CONFIG_ELEMENT_CONTENT_WHITESPACE)
|
|
||||||
&& node->data.text.only_space) {
|
|
||||||
/* Discard all Text nodes that contain
|
/* Discard all Text nodes that contain
|
||||||
* whitespaces in element content]. */
|
* whitespaces in element content]. */
|
||||||
code = DOM_STACK_CODE_FREE_NODE;
|
code = DOM_STACK_CODE_FREE_NODE;
|
||||||
|
} else {
|
||||||
|
code = append_node_text(config, node);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@ -336,7 +335,7 @@ parse_dom_config(unsigned char *flaglist, unsigned char separator)
|
|||||||
|
|
||||||
while (flaglist) {
|
while (flaglist) {
|
||||||
unsigned char *end = separator ? strchr(flaglist, separator) : NULL;
|
unsigned char *end = separator ? strchr(flaglist, separator) : NULL;
|
||||||
int length = end ? flaglist - end : strlen(flaglist);
|
int length = end ? end - flaglist : strlen(flaglist);
|
||||||
struct dom_string name = INIT_DOM_STRING(flaglist, length);
|
struct dom_string name = INIT_DOM_STRING(flaglist, length);
|
||||||
|
|
||||||
flags |= get_dom_config_flag(&name);
|
flags |= get_dom_config_flag(&name);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user