diff options
-rw-r--r-- | render/html_forms.c | 13 | ||||
-rw-r--r-- | render/html_internal.h | 3 | ||||
-rw-r--r-- | utils/corestrings.c | 3 | ||||
-rw-r--r-- | utils/corestrings.h | 1 |
4 files changed, 11 insertions, 9 deletions
diff --git a/render/html_forms.c b/render/html_forms.c index 5b917cde8..284850dc5 100644 --- a/render/html_forms.c +++ b/render/html_forms.c @@ -19,6 +19,7 @@ #include "render/form.h" #include "render/html_internal.h" +#include "utils/corestrings.h" #include "utils/log.h" @@ -479,16 +480,16 @@ struct form_control *html_forms_get_control_for_node(struct form *forms, dom_nod if (err == DOM_NO_ERR && ds_name != NULL) { /* Step three, attempt to work out what gadget to make */ - if (dom_string_caseless_isequal(ds_name, - html_dom_string_button)) { + if (dom_string_caseless_lwc_isequal(ds_name, + corestring_lwc_button)) { ctl = parse_button_element(forms, (dom_html_button_element *) node); - } else if (dom_string_caseless_isequal(ds_name, - html_dom_string_input)) { + } else if (dom_string_caseless_lwc_isequal(ds_name, + corestring_lwc_input)) { ctl = parse_input_element(forms, (dom_html_input_element *) node); - } else if (dom_string_caseless_isequal(ds_name, - html_dom_string_textarea)) { + } else if (dom_string_caseless_lwc_isequal(ds_name, + corestring_lwc_textarea)) { ctl = parse_textarea_element(forms, (dom_html_text_area_element *) node); } diff --git a/render/html_internal.h b/render/html_internal.h index a82d7c5c0..ad032f720 100644 --- a/render/html_internal.h +++ b/render/html_internal.h @@ -173,9 +173,6 @@ extern struct dom_string *html_dom_string_coords; extern struct dom_string *html_dom_string_circle; extern struct dom_string *html_dom_string_poly; extern struct dom_string *html_dom_string_polygon; -extern struct dom_string *html_dom_string_button; -extern struct dom_string *html_dom_string_input; -extern struct dom_string *html_dom_string_textarea; extern struct dom_string *html_dom_string_text_javascript; extern struct dom_string *html_dom_string_type; extern struct dom_string *html_dom_string_src; diff --git a/utils/corestrings.c b/utils/corestrings.c index d266d17c6..9cfe1eaf2 100644 --- a/utils/corestrings.c +++ b/utils/corestrings.c @@ -33,6 +33,7 @@ lwc_string *corestring_lwc_applet; lwc_string *corestring_lwc_baseline; lwc_string *corestring_lwc_body; lwc_string *corestring_lwc_bottom; +lwc_string *corestring_lwc_button; lwc_string *corestring_lwc_caption; lwc_string *corestring_lwc_center; lwc_string *corestring_lwc_col; @@ -113,6 +114,7 @@ void corestrings_fini(void) CSS_LWC_STRING_UNREF(baseline); CSS_LWC_STRING_UNREF(body); CSS_LWC_STRING_UNREF(bottom); + CSS_LWC_STRING_UNREF(button); CSS_LWC_STRING_UNREF(caption); CSS_LWC_STRING_UNREF(center); CSS_LWC_STRING_UNREF(col); @@ -212,6 +214,7 @@ nserror corestrings_init(void) CSS_LWC_STRING_INTERN(baseline); CSS_LWC_STRING_INTERN(body); CSS_LWC_STRING_INTERN(bottom); + CSS_LWC_STRING_INTERN(button); CSS_LWC_STRING_INTERN(caption); CSS_LWC_STRING_INTERN(center); CSS_LWC_STRING_INTERN(col); diff --git a/utils/corestrings.h b/utils/corestrings.h index 236c108bf..52acf1da1 100644 --- a/utils/corestrings.h +++ b/utils/corestrings.h @@ -38,6 +38,7 @@ extern lwc_string *corestring_lwc_applet; extern lwc_string *corestring_lwc_baseline; extern lwc_string *corestring_lwc_body; extern lwc_string *corestring_lwc_bottom; +extern lwc_string *corestring_lwc_button; extern lwc_string *corestring_lwc_caption; extern lwc_string *corestring_lwc_center; extern lwc_string *corestring_lwc_col; |