mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 409604: accesskey on HTML label, area and legend elements don't work, patch by Ehsan Akhgari <ehsan.akhgari@gmail.com>, r+sr=roc, a=beltzner
This commit is contained in:
gavin@gavinsharp.com
parent
69e15d78b0
commit
efc492e216
@ -27,6 +27,7 @@
|
||||
* Masayuki Nakano <masayuki@d-toybox.com>
|
||||
* Ginn Chen <ginn.chen@sun.com>
|
||||
* Simon Bünzli <zeniko@gmail.com>
|
||||
* Ehsan Akhgari <ehsan.akhgari@gmail.com>
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||
@ -1462,6 +1463,17 @@ IsAccessKeyTarget(nsIContent* aContent, nsIFrame* aFrame, nsAString& aKey)
|
||||
if (control)
|
||||
return PR_TRUE;
|
||||
|
||||
if (aContent->IsNodeOfType(nsINode::eHTML)) {
|
||||
nsIAtom* tag = aContent->Tag();
|
||||
|
||||
// HTML area, label and legend elements are never focusable, so
|
||||
// we need to check for them explicitly before giving up.
|
||||
if (tag == nsGkAtoms::area ||
|
||||
tag == nsGkAtoms::label ||
|
||||
tag == nsGkAtoms::legend)
|
||||
return PR_TRUE;
|
||||
}
|
||||
|
||||
return PR_FALSE;
|
||||
}
|
||||
|
||||
|
||||
@ -57,6 +57,7 @@ _TEST_FILES = \
|
||||
test_bug391568.xhtml \
|
||||
test_bug402089.html \
|
||||
test_bug405632.html \
|
||||
test_bug409604.html \
|
||||
$(NULL)
|
||||
|
||||
_CHROME_FILES = \
|
||||
|
||||
320
content/events/test/test_bug409604.html
Normal file
320
content/events/test/test_bug409604.html
Normal file
@ -0,0 +1,320 @@
|
||||
<!DOCTYPE HTML>
|
||||
<html>
|
||||
<!--
|
||||
https://bugzilla.mozilla.org/show_bug.cgi?id=409604
|
||||
-->
|
||||
<head>
|
||||
<title>Test for Bug 409604</title>
|
||||
<script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
|
||||
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
|
||||
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
|
||||
</head>
|
||||
<body id="body">
|
||||
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=409604">Mozilla Bug 409604</a>
|
||||
<p id="display"></p>
|
||||
<div id="content" style="display: none">
|
||||
|
||||
</div>
|
||||
<pre id="test">
|
||||
<script class="testbody" type="text/javascript">
|
||||
|
||||
/** Test for Bug 409604 **/
|
||||
|
||||
var modifier = Components.interfaces.nsIDOMNSEvent.ALT_MASK |
|
||||
Components.interfaces.nsIDOMNSEvent.SHIFT_MASK;
|
||||
var expectedFocus = "d,g,h,k,l,m";
|
||||
var expectedClick = "a,b,c,e,f,i,j";
|
||||
var focusArray = expectedFocus.split(",");
|
||||
var clickArray = expectedClick.split(",");
|
||||
var invalidElementId = "invalid";
|
||||
var invalidTags = [
|
||||
{tag: "abbr", content: "text", attribs: {title: "something"}},
|
||||
{tag: "acronym", content: "text", attribs: {title: "something"}},
|
||||
{tag: "address", content: "text"},
|
||||
{tag: "b", content: "text"},
|
||||
{tag: "bdo", content: "text"},
|
||||
{tag: "big", content: "text"},
|
||||
{tag: "blockquote", content: "text"},
|
||||
{tag: "caption", content: "text", parent: "table", where: "first"},
|
||||
{tag: "cite", content: "text"},
|
||||
{tag: "code", content: "text"},
|
||||
{tag: "dd", content: "text", parent: "dl"},
|
||||
{tag: "del", content: "text"},
|
||||
{tag: "dfn", content: "text", attribs: {title: "something"}},
|
||||
{tag: "div", content: "text"},
|
||||
{tag: "dl", content: "<dd>text</dd>", parent: "dl"},
|
||||
{tag: "dt", content: "text", parent: "dl"},
|
||||
{tag: "em", content: "text"},
|
||||
{tag: "fieldset", content: "text"},
|
||||
{tag: "form", content: "text", attribs: {action: "any.html"}},
|
||||
{tag: "h1", content: "text"},
|
||||
{tag: "h2", content: "text"},
|
||||
{tag: "h3", content: "text"},
|
||||
{tag: "h4", content: "text"},
|
||||
{tag: "h5", content: "text"},
|
||||
{tag: "h6", content: "text"},
|
||||
{tag: "hr"},
|
||||
{tag: "i", content: "text"},
|
||||
{tag: "img", attribs: {src: "any.png", alt: "image"}},
|
||||
{tag: "ins", content: "text"},
|
||||
{tag: "kbd", content: "text"},
|
||||
{tag: "li", content: "text", parent: "ol"},
|
||||
{tag: "li", content: "text", parent: "ul"},
|
||||
{tag: "noscript", content: "text"},
|
||||
{tag: "object", content: "text"},
|
||||
{tag: "ol", content: "<li>text</li>"},
|
||||
{tag: "optgroup", content: "<option>text</option>", attribs: {label: "some label"}, parent: "select"},
|
||||
{tag: "option", content: "text", parent: "select"},
|
||||
{tag: "p", content: "text"},
|
||||
{tag: "pre", content: "text"},
|
||||
{tag: "q", content: "text"},
|
||||
{tag: "samp", content: "text"},
|
||||
{tag: "select", content: "<option>text</option>"},
|
||||
{tag: "small", content: "text"},
|
||||
{tag: "span", content: "text"},
|
||||
{tag: "strong", content: "text"},
|
||||
{tag: "sub", content: "text"},
|
||||
{tag: "sup", content: "text"},
|
||||
{tag: "tt", content: "text"},
|
||||
{tag: "ul", content: "<li>text</li>"},
|
||||
{tag: "var", content: "text"}
|
||||
];
|
||||
var invalidElements = [
|
||||
"body",
|
||||
"col",
|
||||
"colgroup",
|
||||
"map",
|
||||
"table",
|
||||
"tbody",
|
||||
"td",
|
||||
"tfoot",
|
||||
"th",
|
||||
"thead",
|
||||
"tr"
|
||||
];
|
||||
|
||||
// ui.key.contentAccess must be set to value 5 before running the test.
|
||||
function setOrRestoreContentAccess(newValue) {
|
||||
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
||||
const prefSvcContractID = "@mozilla.org/preferences-service;1";
|
||||
const prefSvcIID = Components.interfaces.nsIPrefService;
|
||||
var prefs = Components.classes[prefSvcContractID].getService(prefSvcIID)
|
||||
.getBranch("ui.key.");
|
||||
if (!newValue) {
|
||||
try {
|
||||
prefs.clearUserPref("contentAccess");
|
||||
} catch(ex) {}
|
||||
} else {
|
||||
prefs.setIntPref("contentAccess", newValue);
|
||||
}
|
||||
}
|
||||
|
||||
function handleFocus(e) {
|
||||
ok("accessKey" in e, "(focus) accesskey property not found on element");
|
||||
var expected = focusArray.shift();
|
||||
// "k" is a special case because the element receiving the focus is not
|
||||
// the element which has the accesskey.
|
||||
if (expected == "k") {
|
||||
ok(e.value == "test for label", "(focus) unexpected element: " + e.value +
|
||||
" expected: " + "test for label");
|
||||
// "l" is a special case because the element receiving the focus is not
|
||||
// the element which has the accesskey.
|
||||
} else if (expected == "l") {
|
||||
ok(e.value == "test for legend", "(focus) unexpected element: " + e.value +
|
||||
" expected: " + "test for legend");
|
||||
} else {
|
||||
ok(expected == e.accessKey, "(focus) unexpected element: " + e.accessKey +
|
||||
" expected: " + expected);
|
||||
}
|
||||
}
|
||||
|
||||
function handleClick(e) {
|
||||
ok("accessKey" in e, "(click) accesskey property not found on element");
|
||||
var expected = clickArray.shift();
|
||||
ok(expected == e.accessKey, "(click) unexpected element: " + e.accessKey +
|
||||
" expected: " + expected);
|
||||
}
|
||||
|
||||
function handleInvalid(e) {
|
||||
ok("accessKey" in e, "(invalid) accesskey property not found on element");
|
||||
ok(false, "(invalid) accesskey should not have any effect on this element: " +
|
||||
e.localName);
|
||||
}
|
||||
|
||||
function pressAccessKey(key) {
|
||||
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
||||
// Send key events.
|
||||
var utils = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor).
|
||||
getInterface(Components.interfaces.nsIDOMWindowUtils);
|
||||
utils.sendKeyEvent("keydown", key, key, modifier);
|
||||
utils.sendKeyEvent("keypress", key, key, modifier);
|
||||
utils.sendKeyEvent("keyup", key, key, modifier);
|
||||
}
|
||||
|
||||
function testValidElements() {
|
||||
for (var code = "a".charCodeAt(0); code <= "o".charCodeAt(0); ++ code) {
|
||||
pressAccessKey(code);
|
||||
}
|
||||
ok(focusArray.length == 0, "(focus) unhandled elements remaining: " + focusArray.join(","));
|
||||
ok(clickArray.length == 0, "(click) unhandled elements remaining: " + clickArray.join(","));
|
||||
}
|
||||
|
||||
function createInvalidElement(elem, accesskey) {
|
||||
ok("tag" in elem, "invalid object passed to createInvalidElement: " + elem.toString());
|
||||
var e = document.createElement(elem.tag);
|
||||
if ("content" in elem) {
|
||||
e.innerHTML = elem.content;
|
||||
}
|
||||
if ("attribs" in elem) {
|
||||
for (var attr in elem.attribs) {
|
||||
e.setAttribute(attr, elem.attribs[attr]);
|
||||
}
|
||||
}
|
||||
e.setAttribute("accesskey", accesskey);
|
||||
e.setAttribute("onclick", "handleInvalid(event.target); event.preventDefault();");
|
||||
e.setAttribute("onfocus", "handleInvalid(event.target);");
|
||||
var parent = null;
|
||||
var elementToInsert = null;
|
||||
if ("parent" in elem) {
|
||||
parent = document.getElementById(elem.parent);
|
||||
elementToInsert = e;
|
||||
} else {
|
||||
parent = document.getElementById("tbody");
|
||||
elementToInsert = document.createElement("tr");
|
||||
var td = document.createElement("td");
|
||||
td.textContent = elem.tag;
|
||||
elementToInsert.appendChild(td);
|
||||
td = document.createElement("td");
|
||||
td.appendChild(e);
|
||||
elementToInsert.appendChild(td);
|
||||
}
|
||||
ok(parent != null, "parent element not specified for element: " + elem.tag);
|
||||
ok(elementToInsert != null, "elementToInsert not specified for element: " + elem.tag);
|
||||
elementToInsert.setAttribute("id", invalidElementId);
|
||||
if ("where" in elem) {
|
||||
if (elem.where == "first") {
|
||||
parent.insertBefore(elementToInsert, parent.firstChild);
|
||||
} else {
|
||||
ok(false, "invalid where value specified for element: " + elem.tag);
|
||||
}
|
||||
} else {
|
||||
parent.appendChild(elementToInsert);
|
||||
}
|
||||
}
|
||||
|
||||
function destroyInvalidElement() {
|
||||
var el = document.getElementById(invalidElementId);
|
||||
ok(el != null, "invalid element not found");
|
||||
el.parentNode.removeChild(el);
|
||||
ok(document.getElementById(invalidElementId) == null, "invalid element not properly removed");
|
||||
}
|
||||
|
||||
function testInvalidElements() {
|
||||
var i, e;
|
||||
for (i = 0; i < invalidTags.length; ++ i) {
|
||||
createInvalidElement(invalidTags[i], "z");
|
||||
pressAccessKey("z".charCodeAt(0));
|
||||
destroyInvalidElement();
|
||||
}
|
||||
for (i = 0; i < invalidElements.length; ++ i) {
|
||||
e = document.getElementById(invalidElements[i]);
|
||||
ok(e != null, "element with ID " + invalidElements[i] + " not found");
|
||||
e.setAttribute("accesskey", "z");
|
||||
e.setAttribute("onclick", "handleInvalid(event.target); event.preventDefault();");
|
||||
e.setAttribute("onfocus", "handleInvalid(event.target);");
|
||||
pressAccessKey("z".charCodeAt(0));
|
||||
e.removeAttribute("accesskey");
|
||||
e.removeAttribute("onclick");
|
||||
e.removeAttribute("onfocus");
|
||||
}
|
||||
}
|
||||
|
||||
function start() {
|
||||
testValidElements();
|
||||
testInvalidElements();
|
||||
setOrRestoreContentAccess(0);
|
||||
SimpleTest.finish();
|
||||
}
|
||||
|
||||
function doTest() {
|
||||
setOrRestoreContentAccess(5);
|
||||
setTimeout(start, 100);
|
||||
}
|
||||
|
||||
SimpleTest.waitForExplicitFinish();
|
||||
addLoadEvent(doTest);
|
||||
|
||||
</script>
|
||||
</pre>
|
||||
<table id="table">
|
||||
<thead id="thead">
|
||||
<tr id="tr"><th id="th">Test header</th><th></th></tr>
|
||||
</thead>
|
||||
<tfoot id="tfoot">
|
||||
<tr><td id="td">Test footer</td><td></td></tr>
|
||||
</tfoot>
|
||||
<tbody id="tbody">
|
||||
<colgroup id="colgroup">
|
||||
<col id="col"></col>
|
||||
<col></col>
|
||||
</colgroup>
|
||||
<tr>
|
||||
<td>a</td><td><a href="#" onclick="handleClick(event.target); return false;" accesskey="a">test link</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>area</td><td><img src="about:logo" width="300" height="236" usemap="#map">
|
||||
<map id="map" name="map"><area shape="rect" coords="0,0,82,126" href="#"
|
||||
onclick="handleClick(event.target); return false;" accesskey="b"></map>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>button</td><td><button onclick="handleClick(event.target);" accesskey="c">test button</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>input type="text"</td><td><input type="text" value="" onfocus="handleFocus(event.target);" accesskey="d"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>input type="button"</td><td><input type="button" value="type='button'" onclick="handleClick(event.target);" accesskey="e"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>input type="checkbox"</td><td><input type="checkbox" onclick="handleClick(event.target);" accesskey="f"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>input type="radio"</td><td><input type="radio" name="radio" onfocus="handleFocus(event.target);" accesskey="g"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>input type="password"</td><td><input type="password" onfocus="handleFocus(event.target);" accesskey="h"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>input type="submit"</td><td><input type="submit" value="type='submit'" onclick="handleClick(event.target); return false;" accesskey="i"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>input type="reset"</td><td><input type="submit" value="type='reset'" onclick="handleClick(event.target);" accesskey="j"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>label</td><td><label accesskey="k">test label
|
||||
<input type="text" value="test for label" onfocus="handleFocus(event.target);"></label></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>legend</td><td><fieldset><legend accesskey="l">test legend</legend>
|
||||
<input type="text" value="test for legend" onfocus="handleFocus(event.target);"></fieldset></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>textarea</td><td><textarea onfocus="handleFocus(event.target);" accesskey="m">test text</textarea></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>label (label invisible)</td><td><label for="txt1" accesskey="n" style="display:none">test label</label>
|
||||
<input type="text" id="txt1" value="test for label" onfocus="handleInvalid(event.target);"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>label (control invisible)</td><td><label for="txt2" accesskey="o">test label</label>
|
||||
<input type="text" id="txt2" value="test for label" onfocus="handleInvalid(event.target);" style="display:none"></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<dl id="dl"></dl>
|
||||
<ul id="ul"></ul>
|
||||
<ol id="ol"></ol>
|
||||
<select id="select"></select>
|
||||
</body>
|
||||
</html>
|
||||
Loading…
Reference in New Issue
Block a user