mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure that file inputs update the dom node and annotate with the unencoded filename

This commit is contained in:
Daniel Silverstone 2014-01-04 16:30:52 +00:00
parent 533cfa27da
commit a5bb596eb3
3 changed files with 56 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
render/html.c
View File

@ -1685,6 +1685,47 @@ html_scroll_at_point(struct content *c, int x, int y, int scrx, int scry)
return false;
}
/** Helper for file gadgets to store their filename unencoded on the
* dom node associated with the gadget.
*
* \todo Get rid of this crap eventually
*/
static void html__dom_user_data_handler(dom_node_operation operation,
dom_string *key, void *_data, struct dom_node *src,
struct dom_node *dst)
{
char *oldfile;
char *data = (char *)_data;
if (!dom_string_isequal(corestring_dom___ns_key_libcss_node_data,
key) || data == NULL) {
return;
}
switch (operation) {
case DOM_NODE_CLONED:
if (dom_node_set_user_data(dst,
corestring_dom___ns_key_file_name_node_data,
strdup(data), html__dom_user_data_handler,
&oldfile) == DOM_NO_ERR) {
if (oldfile != NULL)
free(oldfile);
}
break;
case DOM_NODE_RENAMED:
case DOM_NODE_IMPORTED:
case DOM_NODE_ADOPTED:
break;
case DOM_NODE_DELETED:
free(data);
break;
default:
LOG(("User data operation not handled."));
assert(0);
}
}
/**
* Drop a file onto a content at a particular point, or determine if a file
@ -1752,7 +1793,7 @@ static bool html_drop_file_at_point(struct content *c, int x, int y, char *file)
if (file_box) {
/* File dropped on file input */
utf8_convert_ret ret;
char *utf8_fn;
char *utf8_fn, *oldfile = NULL;
ret = utf8_from_local_encoding(file, 0,
&utf8_fn);
@ -1765,8 +1806,16 @@ static bool html_drop_file_at_point(struct content *c, int x, int y, char *file)
}
/* Found: update form input */
free(file_box->gadget->value);
file_box->gadget->value = utf8_fn;
form_gadget_update_value(html, file_box->gadget, utf8_fn);
/* corestring_dom___ns_key_file_name_node_data */
if (dom_node_set_user_data((dom_node *)file_box->gadget->node,
corestring_dom___ns_key_file_name_node_data,
strdup(file), html__dom_user_data_handler,
&oldfile) == DOM_NO_ERR) {
if (oldfile != NULL)
free(oldfile);
}
/* Redraw box. */
html__redraw_a_box(html, file_box);

4
utils/corestrings.c
View File

@ -233,7 +233,7 @@ dom_string *corestring_dom_vspace;
dom_string *corestring_dom_waiting;
dom_string *corestring_dom_width;
dom_string *corestring_dom___ns_key_libcss_node_data;
dom_string *corestring_dom___ns_key_file_name_node_data;
/*
* Free the core strings
@ -464,6 +464,7 @@ void corestrings_fini(void)
CSS_DOM_STRING_UNREF(waiting);
CSS_DOM_STRING_UNREF(width);
CSS_DOM_STRING_UNREF(__ns_key_libcss_node_data);
CSS_DOM_STRING_UNREF(__ns_key_file_name_node_data);
#undef CSS_DOM_STRING_UNREF
}
@ -725,6 +726,7 @@ nserror corestrings_init(void)
CSS_DOM_STRING_INTERN(waiting);
CSS_DOM_STRING_INTERN(width);
CSS_DOM_STRING_INTERN(__ns_key_libcss_node_data);
CSS_DOM_STRING_INTERN(__ns_key_file_name_node_data);
#undef CSS_DOM_STRING_INTERN
exc = dom_string_create_interned((const uint8_t *) "text/javascript",

1
utils/corestrings.h
View File

@ -239,6 +239,7 @@ extern struct dom_string *corestring_dom_vspace;
extern struct dom_string *corestring_dom_waiting;
extern struct dom_string *corestring_dom_width;
extern struct dom_string *corestring_dom___ns_key_libcss_node_data;
extern struct dom_string *corestring_dom___ns_key_file_name_node_data;
#endif