aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

Let html_select, html_textarea, and html_script call do_html_select,

Browse Source 
do_html_textarea, and do_html_script directly instead of handling them
specially in start_element.
This commit is contained in:
Miciah Dashiel Butler Masters 2005-11-25 01:22:55 +00:00 committed by Miciah Dashiel Butler Masters
parent 08c1cdf9d4
commit 9062c83b51
3 changed files with 7 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/document/html/parser/forms.c
View File

@ -301,11 +301,10 @@ hid:
void void
html_select(struct html_context *html_context, unsigned char *a, html_select(struct html_context *html_context, unsigned char *a,
unsigned char *xxx3, unsigned char *xxx4, unsigned char **xxx5) unsigned char *html, unsigned char *eof, unsigned char **end)
{ {
/* Note I haven't seen this code in use, do_html_select() seems to take if (!do_html_select(a, html, eof, end, html_context))
* care of bussiness. --FF */ return;
/* It gets called when the "multiple" attribute is set. --jonas */
unsigned char *al = get_attr_val(a, "name", html_context->options); unsigned char *al = get_attr_val(a, "name", html_context->options);
@ -569,9 +568,9 @@ end_parse:
void void
html_textarea(struct html_context *html_context, unsigned char *a, html_textarea(struct html_context *html_context, unsigned char *a,
unsigned char *xxx3, unsigned char *xxx4, unsigned char **xxx5) unsigned char *html, unsigned char *eof, unsigned char **end)
{ {
INTERNAL("This should be never called"); do_html_textarea(a, html, eof, end, html_context);
} }
void void

4
src/document/html/parser/general.c
View File

@ -161,10 +161,10 @@ html_apply_canvas_bgcolor(struct html_context *html_context)
void void
html_script(struct html_context *html_context, unsigned char *a, html_script(struct html_context *html_context, unsigned char *a,
unsigned char *xxx3, unsigned char *xxx4, unsigned char **xxx5) unsigned char *html, unsigned char *eof, unsigned char **end)
{ {
#ifdef CONFIG_ECMASCRIPT #ifdef CONFIG_ECMASCRIPT
/* We did everything (even possibly html_skip()) in do_html_script(). */ do_html_script(html_context, a, html, eof, end);
#else #else
html_skip(html_context, a); html_skip(html_context, a);
#endif #endif

20
src/document/html/parser/parse.c
View File

@ -789,16 +789,6 @@ start_element(struct element_info *ei,
ln_break(html_context, 2); ln_break(html_context, 2);
return html; return html;
} }
if (ei->func == html_select) {
ELEMENT_RENDER_PROLOGUE
if (!do_html_select(attr, html, eof, &html, html_context))
return html;
}
if (ei->func == html_textarea) {
ELEMENT_RENDER_PROLOGUE
do_html_textarea(attr, html, eof, &html, html_context);
return html;
}
/* Support for <meta refresh="..."> inside <body>. (bug 700) */ /* Support for <meta refresh="..."> inside <body>. (bug 700) */
if (ei->func == html_meta && html_context->was_body) { if (ei->func == html_meta && html_context->was_body) {
@ -858,16 +848,6 @@ start_element(struct element_info *ei,
#endif #endif
} }
#ifdef CONFIG_ECMASCRIPT
/* We need to have own element in the stack, that's why we waited for
* so long. */
if (ei->func == html_script) {
ELEMENT_RENDER_PROLOGUE
if (!do_html_script(html_context, attr, html, eof, &html))
return html;
}
#endif
#ifdef CONFIG_CSS #ifdef CONFIG_CSS
if (html_top.options && html_context->options->css_enable) { if (html_top.options && html_context->options->css_enable) {
/* XXX: We should apply CSS otherwise as well, but that'll need /* XXX: We should apply CSS otherwise as well, but that'll need