Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-18 14:56:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1121272 - Only traverse child elements when traversing the <select> tree r=mconley

Browse Source
This commit is contained in:
George Wright 2015-03-16 19:29:51 -04:00
parent 2197b8f49e
commit 0fa824f57d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
toolkit/modules/SelectContentHelper.jsm
View File

@ -88,11 +88,12 @@ this.SelectContentHelper.prototype = {
function buildOptionListForChildren(node) {
let result = [];
for (let child = node.firstChild; child; child = child.nextSibling) {
if (child.tagName == 'OPTION' || child.tagName == 'OPTGROUP') {
for (let child of node.children) {
let tagName = child.tagName.toUpperCase();
if (tagName == 'OPTION' || tagName == 'OPTGROUP') {
let textContent =
child.tagName == 'OPTGROUP' ? child.getAttribute("label")
: child.textContent;
tagName == 'OPTGROUP' ? child.getAttribute("label")
: child.textContent;
if (textContent != null) {
textContent = textContent.trim();
@ -110,7 +111,7 @@ function buildOptionListForChildren(node) {
// color does not override color: menutext in the parent.
// backgroundColor: computedStyle.backgroundColor,
// color: computedStyle.color,
children: child.tagName == 'OPTGROUP' ? buildOptionListForChildren(child) : []
children: tagName == 'OPTGROUP' ? buildOptionListForChildren(child) : []
};
result.push(info);
}