Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/b2a1b454f521c6010cc1dd05d679533bd73d8392
...commit
http://git.netsurf-browser.org/netsurf.git/commit/b2a1b454f521c6010cc1dd05d679533bd73d8392
...tree
http://git.netsurf-browser.org/netsurf.git/tree/b2a1b454f521c6010cc1dd05d679533bd73d8392
The branch, master has been updated
via b2a1b454f521c6010cc1dd05d679533bd73d8392 (commit)
via 46c9267a11e572949f77f7c4f06f834869cb3cfc (commit)
from 7bc4f46df13f08f04ddb36af083f23b51cd03013 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=b2a1b454f521c6010cc1dd05d679533bd73d8392
commit b2a1b454f521c6010cc1dd05d679533bd73d8392
Merge: 46c9267 7bc4f46
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=46c9267a11e572949f77f7c4f06f834869cb3cfc
commit 46c9267a11e572949f77f7c4f06f834869cb3cfc
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Make disabled textboxes read-only. Partially fixes 2521.
diff --git a/render/box_textarea.c b/render/box_textarea.c
index 44f5c0b..1586d71 100644
--- a/render/box_textarea.c
+++ b/render/box_textarea.c
@@ -239,6 +239,7 @@ bool box_textarea_create_textarea(html_content *html,
textarea_flags ta_flags;
plot_font_style_t fstyle;
bool read_only = false;
+ bool disabled = false;
struct form_control *gadget = box->gadget;
const char *text;
@@ -257,6 +258,11 @@ bool box_textarea_create_textarea(html_content *html,
if (err != DOM_NO_ERR)
return false;
+ err = dom_html_text_area_element_get_disabled(
+ textarea, &disabled);
+ if (err != DOM_NO_ERR)
+ return false;
+
/* Get the textarea's initial content */
err = dom_html_text_area_element_get_value(textarea, &dom_text);
if (err != DOM_NO_ERR)
@@ -270,6 +276,11 @@ bool box_textarea_create_textarea(html_content *html,
if (err != DOM_NO_ERR)
return false;
+ err = dom_html_input_element_get_disabled(
+ input, &disabled);
+ if (err != DOM_NO_ERR)
+ return false;
+
if (gadget->type == GADGET_PASSWORD)
ta_flags = TEXTAREA_PASSWORD;
else
@@ -289,7 +300,7 @@ bool box_textarea_create_textarea(html_content *html,
text = "";
}
- if (read_only)
+ if (read_only || disabled)
ta_flags |= TEXTAREA_READONLY;
gadget->data.text.data.gadget = gadget;
-----------------------------------------------------------------------
Summary of changes:
render/box_textarea.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/render/box_textarea.c b/render/box_textarea.c
index 44f5c0b..1586d71 100644
--- a/render/box_textarea.c
+++ b/render/box_textarea.c
@@ -239,6 +239,7 @@ bool box_textarea_create_textarea(html_content *html,
textarea_flags ta_flags;
plot_font_style_t fstyle;
bool read_only = false;
+ bool disabled = false;
struct form_control *gadget = box->gadget;
const char *text;
@@ -257,6 +258,11 @@ bool box_textarea_create_textarea(html_content *html,
if (err != DOM_NO_ERR)
return false;
+ err = dom_html_text_area_element_get_disabled(
+ textarea, &disabled);
+ if (err != DOM_NO_ERR)
+ return false;
+
/* Get the textarea's initial content */
err = dom_html_text_area_element_get_value(textarea, &dom_text);
if (err != DOM_NO_ERR)
@@ -270,6 +276,11 @@ bool box_textarea_create_textarea(html_content *html,
if (err != DOM_NO_ERR)
return false;
+ err = dom_html_input_element_get_disabled(
+ input, &disabled);
+ if (err != DOM_NO_ERR)
+ return false;
+
if (gadget->type == GADGET_PASSWORD)
ta_flags = TEXTAREA_PASSWORD;
else
@@ -289,7 +300,7 @@ bool box_textarea_create_textarea(html_content *html,
text = "";
}
- if (read_only)
+ if (read_only || disabled)
ta_flags |= TEXTAREA_READONLY;
gadget->data.text.data.gadget = gadget;
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
