Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 22:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1195931, use option.text instead of option.textContent so that spaces get handled properly in select lists, r=felipe

Browse Source
This commit is contained in:
Neil Deakin 2015-08-21 13:30:04 -04:00
parent 7ec5cb2fcf
commit 8a41f6bd15
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
browser/base/content/test/general/browser_selectpopup.js
View File

@ -5,6 +5,8 @@
// in a child process. This is different than single-process as a <menulist> is used // in a child process. This is different than single-process as a <menulist> is used
// to implement the dropdown list. // to implement the dropdown list.
const XHTML_DTD = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">';
const PAGECONTENT = const PAGECONTENT =
"<html xmlns='http://www.w3.org/1999/xhtml'>" + "<html xmlns='http://www.w3.org/1999/xhtml'>" +
"<body onload='gChangeEvents = 0; document.body.firstChild.focus()'><select onchange='gChangeEvents++'>" + "<body onload='gChangeEvents = 0; document.body.firstChild.focus()'><select onchange='gChangeEvents++'>" +
@ -19,8 +21,8 @@ const PAGECONTENT =
" </optgroup>" + " </optgroup>" +
" <option value='Six' disabled='true'>Six</option>" + " <option value='Six' disabled='true'>Six</option>" +
" <optgroup label='Third Group'>" + " <optgroup label='Third Group'>" +
" <option value='Seven'>Seven</option>" + " <option value='Seven'> Seven </option>" +
" <option value='Eight'>Eight</option>" + " <option value='Eight'>&nbsp;&nbsp;Eight&nbsp;&nbsp;</option>" +
" </optgroup></select><input />" + " </optgroup></select><input />" +
"</body></html>"; "</body></html>";
@ -58,11 +60,11 @@ function getChangeEvents()
}); });
} }
function doSelectTests(contentType) function doSelectTests(contentType, dtd)
{ {
let tab = gBrowser.selectedTab = gBrowser.addTab(); let tab = gBrowser.selectedTab = gBrowser.addTab();
let browser = gBrowser.getBrowserForTab(tab); let browser = gBrowser.getBrowserForTab(tab);
yield promiseTabLoadEvent(tab, "data:" + contentType + "," + escape(PAGECONTENT)); yield promiseTabLoadEvent(tab, "data:" + contentType + "," + escape(dtd + "\n" + PAGECONTENT));
yield SimpleTest.promiseFocus(browser.contentWindow); yield SimpleTest.promiseFocus(browser.contentWindow);
@ -127,15 +129,17 @@ function doSelectTests(contentType)
EventUtils.synthesizeKey("VK_TAB", { shiftKey: true }); EventUtils.synthesizeKey("VK_TAB", { shiftKey: true });
is((yield getChangeEvents()), isWindows ? 2 : 1, "Tab away from select with change - number of change events"); is((yield getChangeEvents()), isWindows ? 2 : 1, "Tab away from select with change - number of change events");
is(selectPopup.lastChild.previousSibling.label, "Seven", "Spaces collapsed");
is(selectPopup.lastChild.label, "\xA0\xA0Eight\xA0\xA0", "Non-breaking spaces not collapsed");
gBrowser.removeCurrentTab(); gBrowser.removeCurrentTab();
} }
add_task(function*() { add_task(function*() {
yield doSelectTests("text/html"); yield doSelectTests("text/html", "");
}); });
add_task(function*() { add_task(function*() {
yield doSelectTests("application/xhtml+xml"); yield doSelectTests("application/xhtml+xml", XHTML_DTD);
}); });

9
toolkit/modules/SelectContentHelper.jsm
View File

@ -101,12 +101,9 @@ function buildOptionListForChildren(node) {
if (tagName == 'OPTION' || tagName == 'OPTGROUP') { if (tagName == 'OPTION' || tagName == 'OPTGROUP') {
let textContent = let textContent =
tagName == 'OPTGROUP' ? child.getAttribute("label") tagName == 'OPTGROUP' ? child.getAttribute("label")
: child.textContent; : child.text;
if (textContent == null) {
if (textContent != null) { textContent = "";
textContent = textContent.trim();
} else {
textContent = ""
} }
let info = { let info = {