Merge mozilla-inbound to mozilla-central. a=merge

This commit is contained in:
Daniel Varga 2018-10-20 13:10:23 +03:00
commit 4fc7bfa931
2280 changed files with 16370 additions and 11949 deletions

View File

@ -39,27 +39,5 @@ module.exports = {
"env": {
"mozilla/browser-window": true
}
}, {
// XXX Bug 1486741 - We've not rolled out comma-dangle to these directories
// yet, so turn it off for now.
"files": [
"accessible/**",
"caps/**",
"chrome/**",
"devtools/**",
"dom/**",
"extensions/**",
"intl/**",
"js/**",
"mobile/**",
"security/**",
"storage/**",
"testing/**",
"tools/**",
"xpcom/**",
],
"rules": {
"comma-dangle": "off",
}
}]
};

10
Cargo.lock generated
View File

@ -767,7 +767,7 @@ dependencies = [
[[package]]
name = "dwrote"
version = "0.5.1"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2932,7 +2932,7 @@ dependencies = [
"core-foundation 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-graphics 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)",
"core-text 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"dwrote 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"dwrote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
"freetype 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2960,7 +2960,7 @@ dependencies = [
"byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"core-foundation 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-graphics 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)",
"dwrote 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"dwrote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_bytes 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2976,7 +2976,7 @@ dependencies = [
"bincode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-foundation 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-graphics 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)",
"dwrote 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"dwrote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
"foreign-types 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3185,7 +3185,7 @@ dependencies = [
"checksum docopt 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d8acd393692c503b168471874953a2531df0e9ab77d0b6bbc582395743300a4a"
"checksum dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "09c3753c3db574d215cba4ea76018483895d7bff25a31b49ba45db21c48e50ab"
"checksum dtoa-short 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "068d4026697c1a18f0b0bb8cfcad1b0c151b90d8edb9bf4c235ad68128920d1d"
"checksum dwrote 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "30a998e9ff70cd208ccdc4f864e998688bf61d7b897dccec8e17a884d17358bf"
"checksum dwrote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f5472f94ba0d9e65b4fefb8c1661ad5b253455eec42cb0702cf0189526321034"
"checksum either 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "18785c1ba806c258137c937e44ada9ee7e69a37e3c72077542cd2f069d78562a"
"checksum ena 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "88dc8393b3c7352f94092497f6b52019643e493b6b890eb417cdb7c46117e621"
"checksum encoding_c 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "769ecb8b33323998e482b218c0d13cd64c267609023b4b7ec3ee740714c318ee"

View File

@ -70,8 +70,10 @@ ARIAGridAccessible::ColCount() const
Accessible* cell = nullptr;
uint32_t colCount = 0;
while ((cell = cellIter.Next()))
colCount++;
while ((cell = cellIter.Next())) {
MOZ_ASSERT(cell->IsTableCell(), "No table or grid cell!");
colCount += cell->AsTableCell()->ColExtent();
}
return colCount;
}
@ -602,10 +604,9 @@ ARIAGridCellAccessible::ColIdx() const
uint32_t colIdx = 0;
for (int32_t idx = 0; idx < indexInRow; idx++) {
Accessible* cell = row->GetChildAt(idx);
roles::Role role = cell->Role();
if (role == roles::CELL || role == roles::GRID_CELL ||
role == roles::ROWHEADER || role == roles::COLUMNHEADER)
colIdx++;
if (cell->IsTableCell()) {
colIdx += cell->AsTableCell()->ColExtent();
}
}
return colIdx;

View File

@ -261,9 +261,11 @@ TableAccessible::CellInRowAt(Accessible* aRow, int32_t aColumn)
int32_t colIdx = aColumn;
AccIterator cellIter(aRow, filters::GetCell);
Accessible* cell = cellIter.Next();
while (colIdx != 0 && (cell = cellIter.Next())) {
colIdx--;
Accessible* cell = nullptr;
while (colIdx >= 0 && (cell = cellIter.Next())) {
MOZ_ASSERT(cell->IsTableCell(), "No table or grid cell!");
colIdx -= cell->AsTableCell()->ColExtent();
}
return cell;

View File

@ -638,7 +638,19 @@ HTMLTableAccessible::CellIndexAt(uint32_t aRowIdx, uint32_t aColIdx)
if (!tableFrame)
return -1;
return tableFrame->GetIndexByRowAndColumn(aRowIdx, aColIdx);
int32_t cellIndex = tableFrame->GetIndexByRowAndColumn(aRowIdx, aColIdx);
if (cellIndex == -1) {
// Sometimes, the accessible returned here is a row accessible instead of
// a cell accessible, for example when a cell has CSS display:block; set.
// In such cases, iterate through the cells in this row differently to find it.
nsIContent* cellContent = tableFrame->GetCellAt(aRowIdx, aColIdx);
Accessible* cell = mDoc->GetAccessible(cellContent);
if (cell && cell->IsTableRow()) {
return TableAccessible::CellIndexAt(aRowIdx, aColIdx);
}
}
return cellIndex;
}
int32_t
@ -650,6 +662,14 @@ HTMLTableAccessible::ColIndexAt(uint32_t aCellIdx)
int32_t rowIdx = -1, colIdx = -1;
tableFrame->GetRowAndColumnByIndex(aCellIdx, &rowIdx, &colIdx);
if (colIdx == -1) {
// Sometimes, the index returned indicates that this is not a regular
// cell, for example when a cell has CSS display:block; set.
// In such cases, try the super class method to find it.
return TableAccessible::ColIndexAt(aCellIdx);
}
return colIdx;
}
@ -662,6 +682,14 @@ HTMLTableAccessible::RowIndexAt(uint32_t aCellIdx)
int32_t rowIdx = -1, colIdx = -1;
tableFrame->GetRowAndColumnByIndex(aCellIdx, &rowIdx, &colIdx);
if (rowIdx == -1) {
// Sometimes, the index returned indicates that this is not a regular
// cell, for example when a cell has CSS display:block; set.
// In such cases, try the super class method to find it.
return TableAccessible::RowIndexAt(aCellIdx);
}
return rowIdx;
}
@ -670,8 +698,15 @@ HTMLTableAccessible::RowAndColIndicesAt(uint32_t aCellIdx, int32_t* aRowIdx,
int32_t* aColIdx)
{
nsTableWrapperFrame* tableFrame = do_QueryFrame(mContent->GetPrimaryFrame());
if (tableFrame)
if (tableFrame) {
tableFrame->GetRowAndColumnByIndex(aCellIdx, aRowIdx, aColIdx);
if (*aRowIdx == -1 || *aColIdx == -1) {
// Sometimes, the index returned indicates that this is not a regular
// cell, for example when a cell has CSS display:block; set.
// In such cases, try the super class method to find it.
TableAccessible::RowAndColIndicesAt(aCellIdx, aRowIdx, aColIdx);
}
}
}
uint32_t
@ -681,7 +716,16 @@ HTMLTableAccessible::ColExtentAt(uint32_t aRowIdx, uint32_t aColIdx)
if (!tableFrame)
return 0;
return tableFrame->GetEffectiveColSpanAt(aRowIdx, aColIdx);
uint32_t colExtent = tableFrame->GetEffectiveColSpanAt(aRowIdx, aColIdx);
if (colExtent == 0) {
nsIContent* cellContent = tableFrame->GetCellAt(aRowIdx, aColIdx);
Accessible* cell = mDoc->GetAccessible(cellContent);
if (cell && cell->IsTableRow()) {
return TableAccessible::ColExtentAt(aRowIdx, aColIdx);
}
}
return colExtent;
}
uint32_t

View File

@ -257,7 +257,7 @@ var AccessFu = {
bounds = bounds.scale(1 / devicePixelRatio, 1 / devicePixelRatio);
bounds = bounds.translate(-mozInnerScreenX, -mozInnerScreenY);
return bounds.expandToIntegers();
}
},
};
var Input = {
@ -315,6 +315,6 @@ var Input = {
winUtils.sendWheelEvent(p.x, p.y,
horizontal ? page : 0, horizontal ? 0 : page, 0,
win.WheelEvent.DOM_DELTA_PAGE, 0, 0, 0, 0);
}
},
};
AccessFu.Input = Input;

View File

@ -479,7 +479,7 @@ this.ContentControl.prototype = {
moveMethod: aOptions.moveMethod,
moveToFocused: aOptions.moveToFocused,
noOpIfOnScreen: true,
}
},
}, null, true);
};
@ -496,6 +496,6 @@ this.ContentControl.prototype = {
},
QueryInterface: ChromeUtils.generateQI([Ci.nsISupportsWeakReference,
Ci.nsIMessageListener
])
Ci.nsIMessageListener,
]),
};

View File

@ -134,7 +134,7 @@ this.EventManager.prototype = {
}
},
QueryInterface: ChromeUtils.generateQI([Ci.nsISupportsWeakReference, Ci.nsIObserver])
QueryInterface: ChromeUtils.generateQI([Ci.nsISupportsWeakReference, Ci.nsIObserver]),
};
const AccessibilityEventObserver = {
@ -283,5 +283,5 @@ const AccessibilityEventObserver = {
} finally {
return;
}
}
},
};

View File

@ -56,7 +56,7 @@ BaseTraversalRule.prototype = {
return Filters.IGNORE;
},
QueryInterface: ChromeUtils.generateQI([Ci.nsIAccessibleTraversalRule])
QueryInterface: ChromeUtils.generateQI([Ci.nsIAccessibleTraversalRule]),
};
var gSimpleTraversalRoles =
@ -221,7 +221,7 @@ var TraversalRules = { // jshint ignore:line
"main",
"navigation",
"search",
"region"
"region",
]);
return matchedRole ? Filters.MATCH : Filters.IGNORE;
@ -346,7 +346,7 @@ var TraversalRules = { // jshint ignore:line
return Filters.IGNORE;
}
return Filters.MATCH;
}
},
};
var TraversalHelper = {
@ -393,6 +393,6 @@ var TraversalHelper = {
}
return aVirtualCursor[aMethod](rule);
}
},
};

View File

@ -26,7 +26,7 @@ var Utils = { // jshint ignore:line
"{3c2e2abc-06d4-11e1-ac3b-374f68613e61}": "b2g",
"{d1bfe7d9-c01e-4237-998b-7b5f960a4314}": "graphene",
"{ec8030f7-c20a-464f-9b0e-13a3a9e97384}": "browser",
"{aa3c5121-dab2-40e2-81ca-7ea25febc110}": "mobile/android"
"{aa3c5121-dab2-40e2-81ca-7ea25febc110}": "mobile/android",
},
get AccService() {
@ -129,7 +129,7 @@ var Utils = { // jshint ignore:line
} finally {
return str;
}
}
},
};
return this.stringBundle;
},
@ -287,7 +287,7 @@ var Utils = { // jshint ignore:line
"contentinfo",
"main",
"navigation",
"search"
"search",
]);
},
@ -304,7 +304,7 @@ var Utils = { // jshint ignore:line
"root-index",
"subscript",
"superscript",
"underscript"
"underscript",
]);
},
@ -341,7 +341,7 @@ var Utils = { // jshint ignore:line
return parent.role === Roles.LISTITEM && parent.childCount > 1 &&
aStaticText.indexInParent === 0;
}
},
};
/**
@ -366,7 +366,7 @@ State.prototype = {
statesArray[i] = stateStrings.item(i);
}
return "[" + statesArray.join(", ") + "]";
}
},
};
var Logger = { // jshint ignore:line
@ -513,7 +513,7 @@ var Logger = { // jshint ignore:line
this._dumpTreeInternal(aLogLevel, aAccessible.getChildAt(i),
aIndent + 1);
}
}
},
};
/**
@ -702,7 +702,7 @@ PivotContext.prototype = {
} else if (aAccessible.actionCount > 0) {
hints.push({
string: Utils.AccService.getStringRole(
aAccessible.role).replace(/\s/g, "") + "-hint"
aAccessible.role).replace(/\s/g, "") + "-hint",
});
}
});
@ -741,7 +741,7 @@ PivotContext.prototype = {
Roles.CELL,
Roles.COLUMNHEADER,
Roles.ROWHEADER,
Roles.MATHML_CELL
Roles.MATHML_CELL,
].includes(aAccessible.role)) {
return null;
}
@ -829,7 +829,7 @@ PivotContext.prototype = {
} catch (x) {
return true;
}
}
},
};
function PrefCache(aName, aCallback, aRunCallbackNow) { // jshint ignore:line
@ -885,5 +885,5 @@ PrefCache.prototype = {
},
QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
Ci.nsISupportsWeakReference])
Ci.nsISupportsWeakReference]),
};

View File

@ -178,5 +178,5 @@ var gActionDescrMap =
collapse: "Collapse",
expand: "Expand",
activate: "Activate",
cycle: "Cycle"
cycle: "Cycle",
};

View File

@ -43,8 +43,8 @@
actionIndex: 0,
events: CLICK_EVENTS,
eventSeq: [
new scrollingChecker(getAccessible("bottom1"))
]
new scrollingChecker(getAccessible("bottom1")),
],
},
{ // jump again (test for bug 437607)
ID: "anchor1",
@ -52,8 +52,8 @@
actionIndex: 0,
events: CLICK_EVENTS,
eventSeq: [
new scrollingChecker(getAccessible("bottom1"))
]
new scrollingChecker(getAccessible("bottom1")),
],
},
{
ID: "anchor2",
@ -61,9 +61,9 @@
actionIndex: 0,
events: CLICK_EVENTS,
eventSeq: [
new scrollingChecker(getAccessible("bottom2"))
]
}
new scrollingChecker(getAccessible("bottom2")),
],
},
];
testActions(actionsArray);

View File

@ -22,108 +22,108 @@
{
ID: "clickable",
actionName: "click",
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: "button",
actionName: "press",
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: "checkbox_unchecked",
actionName: "check",
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: "checkbox_checked",
actionName: "uncheck",
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: "checkbox_mixed",
actionName: "cycle",
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: "combobox_collapsed",
actionName: "open",
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: "combobox_expanded",
actionName: "close",
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: "link",
actionName: "jump",
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: "menuitem",
actionName: "click",
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: "menuitemcheckbox",
actionName: "click",
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: "menuitemradio",
actionName: "click",
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: "option",
actionName: "select",
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: "radio",
actionName: "select",
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: "switch_unchecked",
actionName: "check",
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: "switch_checked",
actionName: "uncheck",
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: "tab",
actionName: "switch",
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: "textbox",
actionName: "activate",
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: "treeitem",
actionName: "activate",
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: "sortable",
actionName: "sort",
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: "expandable",
actionName: "expand",
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: "collapseable",
actionName: "collapse",
events: CLICK_EVENTS
}
events: CLICK_EVENTS,
},
];
testActions(actionsArray);
}

View File

@ -26,43 +26,43 @@
{
ID: "button",
actionName: "press",
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: "input_button",
actionName: "press",
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: "checkbox_unchecked",
actionName: "check",
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: "checkbox_checked",
actionName: "uncheck",
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: "checkbox_mixed",
actionName: "cycle",
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: "radio",
actionName: "select",
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: "textarea",
actionName: "activate",
events: FOCUS_EVENT
events: FOCUS_EVENT,
},
{
ID: "textinput",
actionName: "activate",
events: FOCUS_EVENT
}
events: FOCUS_EVENT,
},
];
document.getElementById("checkbox_mixed").indeterminate = true;

View File

@ -22,28 +22,28 @@
{
ID: "li_clickable1",
actionName: "click",
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: "li_clickable2",
actionName: "click",
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: "li_clickable3",
actionName: "click",
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: "onclick_img",
actionName: "click",
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: "label1",
actionName: "click",
events: CLICK_EVENTS
}
events: CLICK_EVENTS,
},
];

View File

@ -60,8 +60,8 @@
actionName: "jump",
events: CLICK_EVENTS,
eventSeq: [
new linkChecker("link1")
]
new linkChecker("link1"),
],
},
{
ID: "img1",
@ -69,42 +69,42 @@
actionName: "jump",
events: CLICK_EVENTS,
eventSeq: [
new linkChecker("link1")
]
new linkChecker("link1"),
],
},
{
ID: "link2",
actionName: "click",
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: "img2",
targetID: "link2",
actionName: "jump",
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: "link3",
actionName: "click",
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: "img3",
targetID: "link3",
actionName: "jump",
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: "link4",
actionName: "click",
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: "img4",
targetID: "link4",
actionName: "jump",
events: CLICK_EVENTS
}
events: CLICK_EVENTS,
},
];
testActions(actionsArray);
}

View File

@ -86,7 +86,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=483573
eventSeq: [
// new focusChecker(muteBtn),
new nameChecker(muteBtn, "Unmute"),
]
],
},
// {
// ID: scrubber,
@ -103,8 +103,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=483573
eventSeq: [
// new focusChecker(playBtn),
new nameChecker(playBtn, "Pause"),
]
}
],
},
];
testActions(actions); // Will call SimpleTest.finish();

View File

@ -30,8 +30,8 @@
actionName: "select",
events: CLICK_EVENTS,
eventSeq: [
new focusChecker("lb_apple")
]
new focusChecker("lb_apple"),
],
},
{
ID: "combobox",
@ -39,8 +39,8 @@
actionName: "open",
events: CLICK_EVENTS,
eventSeq: [
new focusChecker("cb_orange")
]
new focusChecker("cb_orange"),
],
},
{
ID: "cb_apple",
@ -48,8 +48,8 @@
actionName: "select",
events: CLICK_EVENTS,
eventSeq: [
new focusChecker("combobox")
]
new focusChecker("combobox"),
],
},
{
ID: "combobox",
@ -57,8 +57,8 @@
actionName: "open",
events: CLICK_EVENTS,
eventSeq: [
new focusChecker("cb_apple")
]
new focusChecker("cb_apple"),
],
},
{
ID: "combobox",
@ -66,9 +66,9 @@
actionName: "close",
events: CLICK_EVENTS,
eventSeq: [
new focusChecker("combobox")
]
}
new focusChecker("combobox"),
],
},
];
testActions(actionsArray);

View File

@ -105,17 +105,17 @@
switch (anode.states.length) {
case 5:
states = [
"readonly", "focusable", "opaque", "enabled", "sensitive"
"readonly", "focusable", "opaque", "enabled", "sensitive",
];
break;
case 6:
states = [
"readonly", "busy", "focusable", "opaque", "enabled", "sensitive"
"readonly", "busy", "focusable", "opaque", "enabled", "sensitive",
];
break;
case 7:
states = [
"readonly", "busy", "focusable", "opaque", "stale", "enabled", "sensitive"
"readonly", "busy", "focusable", "opaque", "stale", "enabled", "sensitive",
];
break;
default:
@ -141,7 +141,7 @@
attrs = [
"margin-left", "text-align", "text-indent", "margin-right",
"tag", "margin-top", "margin-bottom", "display",
"explicit-name"
"explicit-name",
];
}

View File

@ -59,7 +59,7 @@ function testCSSAttrs(aID) {
"margin-left": computedStyle.marginLeft,
"margin-right": computedStyle.marginRight,
"margin-top": computedStyle.marginTop,
"margin-bottom": computedStyle.marginBottom
"margin-bottom": computedStyle.marginBottom,
};
testAttrs(aID, attrs, true);
}
@ -75,7 +75,7 @@ function testAbsentCSSAttrs(aID) {
"margin-left": "",
"margin-right": "",
"margin-top": "",
"margin-bottom": ""
"margin-bottom": "",
};
testAbsentAttrs(aID, attrs);
}
@ -102,7 +102,7 @@ function testGroupAttrs(aAccOrElmOrID, aPosInSet, aSetSize, aLevel) {
let attrs = {
"posinset": String(aPosInSet),
"setsize": String(aSetSize)
"setsize": String(aSetSize),
};
testAttrs(aAccOrElmOrID, attrs, true);
}
@ -299,7 +299,7 @@ function buildDefaultTextAttrs(aID, aFontSize, aFontWeight, aFontFamily) {
"font-weight": aFontWeight ? aFontWeight : kNormalFontWeight,
"color": computedStyle.color,
"font-family": aFontFamily ? aFontFamily : fontFamily(computedStyle),
"text-position": computedStyle.verticalAlign
"text-position": computedStyle.verticalAlign,
};
return defAttrs;

View File

@ -58,7 +58,7 @@
"doc-qna",
"doc-subtitle",
"doc-tip",
"doc-toc"
"doc-toc",
];
for (let attr of dpub_attrs) {
testAttrs(attr, {"xml-roles": attr}, true);

View File

@ -22,7 +22,7 @@
let graphics_attrs = [
"graphics-document",
"graphics-object",
"graphics-symbol"
"graphics-symbol",
];
for (let attr of graphics_attrs) {
testAttrs(attr, {"xml-roles": attr}, true);

View File

@ -135,7 +135,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=558036
var gfxInfo = Cc["@mozilla.org/gfx/info;1"].
getService(Ci.nsIGfxInfo);
var attrs = {
"D2D": (gfxInfo.D2DEnabled ? "true" : "false")
"D2D": (gfxInfo.D2DEnabled ? "true" : "false"),
};
testAttrs(getApplicationAccessible(), attrs, false);
}

View File

@ -22,7 +22,7 @@
this.accessible = getAccessible(aID);
this.eventSeq = [
new invokerChecker(EVENT_HIDE, this.accessible)
new invokerChecker(EVENT_HIDE, this.accessible),
];
this.invoke = function removeElm_invoke() {

View File

@ -85,7 +85,7 @@ ResultsHeap.prototype =
}
}
return new AutoCompleteResult(values, comments);
}
},
};
@ -124,7 +124,7 @@ AutoCompleteSearch.prototype =
name: null,
// Results heap.
allResults: null
allResults: null,
};
@ -185,5 +185,5 @@ AutoCompleteResult.prototype =
// Data
values: null,
comments: null
comments: null,
};

View File

@ -26,7 +26,7 @@
this.comboboxOption = this.comboboxList.firstChild;
this.eventSeq = [
new invokerChecker(EVENT_FOCUS, this.comboboxOption)
new invokerChecker(EVENT_FOCUS, this.comboboxOption),
];
this.invoke = function openComboboxNCheckBounds_invoke() {

View File

@ -97,7 +97,7 @@ var gBrowserContext =
{
browserWnd: null,
testFunc: null,
startURL: ""
startURL: "",
};
function openBrowserWindowIntl() {

View File

@ -929,7 +929,7 @@ function normalizeAccTreeObj(aObj) {
if (roleName in nsIAccessibleRole) {
return {
role: nsIAccessibleRole[roleName],
children: aObj[key]
children: aObj[key],
};
}
return aObj;

View File

@ -37,7 +37,7 @@ function editableTextTest(aID) {
// it's used to generate real invoker when previous invoker was handled.
var dataContainer = {
func: aFunc,
funcArgs: Array.slice(arguments, 1)
funcArgs: Array.slice(arguments, 1),
};
this.mEventQueue.push(dataContainer);
@ -217,7 +217,7 @@ function editableTextTest(aID) {
var checker = {
check: function valueChecker_check() {
is(getValue(), aValue, "Wrong value " + aValue);
}
},
};
return checker;
}
@ -226,7 +226,7 @@ function editableTextTest(aID) {
var checker = {
check: function clipboardChecker_check() {
is(getTextFromClipboard(), aText, "Wrong text in clipboard.");
}
},
};
return checker;
}
@ -256,7 +256,7 @@ function editableTextTest(aID) {
aChecker.check();
et.unwrapNextTest(); // replace dummy invoker on real invoker object.
},
getID: function getID() { return aInvokerID; }
getID: function getID() { return aInvokerID; },
};
if (aRemoveTriple) {

File diff suppressed because it is too large Load Diff

View File

@ -54,19 +54,19 @@
obj = {
role: ROLE_MATHML_OPERATOR,
attributes: { accent: "true", largeop: "true" }
attributes: { accent: "true", largeop: "true" },
};
testElm("mo", obj);
obj = {
role: ROLE_MATHML_OPERATOR,
attributes: { fence: "true" }
attributes: { fence: "true" },
};
testElm("mo_fence", obj);
obj = {
role: ROLE_MATHML_OPERATOR,
attributes: { separator: "true" }
attributes: { separator: "true" },
};
testElm("mo_separator", obj);
@ -107,7 +107,7 @@
obj = {
role: ROLE_MATHML_FRACTION,
attributes: { bevelled: "true", linethickness: "thick" }
attributes: { bevelled: "true", linethickness: "thick" },
};
testElm("mfrac", obj);
@ -125,18 +125,18 @@
obj = {
role: ROLE_MATHML_ROOT,
relations: {
RELATION_NODE_PARENT_OF: ["mroot_index", "mroot_base"]
RELATION_NODE_PARENT_OF: ["mroot_index", "mroot_base"],
},
children: [
{
role: ROLE_MATHML_IDENTIFIER,
relations: { RELATION_NODE_CHILD_OF: "mroot" }
relations: { RELATION_NODE_CHILD_OF: "mroot" },
},
{
role: ROLE_MATHML_NUMBER,
relations: { RELATION_NODE_CHILD_OF: "mroot" }
}
]
relations: { RELATION_NODE_CHILD_OF: "mroot" },
},
],
};
testElm("mroot", obj);
@ -145,7 +145,7 @@
obj = {
role: ROLE_MATHML_FENCED,
attributes: { open: "]", close: "[", separators: "." }
attributes: { open: "]", close: "[", separators: "." },
};
testElm("mfenced", obj);
@ -154,7 +154,7 @@
obj = {
role: ROLE_MATHML_ENCLOSED,
attributes: { notation: "circle" }
attributes: { notation: "circle" },
};
testElm("menclose", obj);
@ -198,7 +198,7 @@
obj = {
role: ROLE_MATHML_UNDER,
attributes: { accentunder: "true", align: "center" }
attributes: { accentunder: "true", align: "center" },
};
testElm("munder", obj);
@ -207,7 +207,7 @@
obj = {
role: ROLE_MATHML_OVER,
attributes: { accent: "true", align: "center" }
attributes: { accent: "true", align: "center" },
};
testElm("mover", obj);
@ -233,7 +233,7 @@
obj = {
role: ROLE_MATHML_TABLE,
attributes: { align: "center", columnlines: "solid", rowlines: "solid" }
attributes: { align: "center", columnlines: "solid", rowlines: "solid" },
};
testElm("mtable", obj);
@ -266,7 +266,7 @@
obj = {
role: ROLE_MATHML_ACTION,
attributes: { actiontype: "toggle", selection: "1" }
attributes: { actiontype: "toggle", selection: "1" },
};
testElm("maction", obj);
@ -289,7 +289,7 @@
obj = {
role: ROLE_MATHML_STACK,
attributes: { align: "center" }
attributes: { align: "center" },
};
testElm("mstack", obj);
@ -298,7 +298,7 @@
obj = {
role: ROLE_MATHML_LONG_DIVISION,
attributes: { longdivstyle: "stackedrightright" }
attributes: { longdivstyle: "stackedrightright" },
};
testElm("mlongdiv", obj);
@ -307,7 +307,7 @@
obj = {
role: ROLE_MATHML_STACK_GROUP,
attributes: { position: "2", shift: "-1" }
attributes: { position: "2", shift: "-1" },
};
testElm("msgroup", obj);
@ -316,7 +316,7 @@
obj = {
role: ROLE_MATHML_STACK_ROW,
attributes: { position: "1" }
attributes: { position: "1" },
};
testElm("msrow", obj);
@ -325,7 +325,7 @@
obj = {
role: ROLE_MATHML_STACK_CARRIES,
attributes: { location: "nw", position: "1" }
attributes: { location: "nw", position: "1" },
};
testElm("mscarries", obj);
@ -334,7 +334,7 @@
obj = {
role: ROLE_MATHML_STACK_CARRY,
attributes: { crossout: "updiagonalstrike" }
attributes: { crossout: "updiagonalstrike" },
};
testElm("mscarry", obj);
@ -343,7 +343,7 @@
obj = {
role: ROLE_MATHML_STACK_LINE,
attributes: { position: "1" }
attributes: { position: "1" },
};
testElm("msline", obj);

View File

@ -25,8 +25,8 @@
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({
set: [
["dom.webcomponents.shadowdom.enabled", true]
]
["dom.webcomponents.shadowdom.enabled", true],
],
}, function() {
// This test loads in an iframe, to ensure that the element instance is
// loaded with the correct value of the preference.

View File

@ -21,7 +21,7 @@
{
role: ROLE_LINK,
},
]
],
});
SimpleTest.finish();

View File

@ -112,7 +112,7 @@ function waitForEvent(aEventType, aTargetOrFunc, aFunc, aContext, aArg1, aArg2)
},
0
);
}
},
};
registerA11yEventListener(aEventType, handler);
@ -134,7 +134,7 @@ function waitForEventPromise(eventType, target) {
Services.obs.removeObserver(this, "accessible-event");
resolve(event);
}
}
},
};
Services.obs.addObserver(eventObserver, "accessible-event");
});
@ -1411,7 +1411,7 @@ function synthContextMenu(aID, aCheckerOrEventSeq) {
*/
function openCombobox(aComboboxID) {
this.eventSeq = [
new stateChangeChecker(STATE_EXPANDED, false, true, aComboboxID)
new stateChangeChecker(STATE_EXPANDED, false, true, aComboboxID),
];
this.invoke = function openCombobox_invoke() {
@ -1429,7 +1429,7 @@ function openCombobox(aComboboxID) {
*/
function closeCombobox(aComboboxID) {
this.eventSeq = [
new stateChangeChecker(STATE_EXPANDED, false, false, aComboboxID)
new stateChangeChecker(STATE_EXPANDED, false, false, aComboboxID),
];
this.invoke = function closeCombobox_invoke() {
@ -1569,7 +1569,7 @@ function moveCaretToDOMPoint(aID, aDOMPointNodeID, aDOMPointOffset,
};
this.eventSeq = [
new caretMoveChecker(aExpectedOffset, this.target)
new caretMoveChecker(aExpectedOffset, this.target),
];
if (this.focus)
@ -1593,7 +1593,7 @@ function setCaretOffset(aID, aOffset, aFocusTargetID) {
};
this.eventSeq = [
new caretMoveChecker(this.offset, this.target)
new caretMoveChecker(this.offset, this.target),
];
if (this.focus)
@ -1904,7 +1904,7 @@ function selChangeSeq(aUnselectedID, aSelectedID) {
if (!aUnselectedID) {
return [
new stateChangeChecker(STATE_SELECTED, false, true, aSelectedID),
new invokerChecker(EVENT_SELECTION, aSelectedID)
new invokerChecker(EVENT_SELECTION, aSelectedID),
];
}
@ -1914,13 +1914,13 @@ function selChangeSeq(aUnselectedID, aSelectedID) {
[
new stateChangeChecker(STATE_SELECTED, false, false, aUnselectedID),
new stateChangeChecker(STATE_SELECTED, false, true, aSelectedID),
new invokerChecker(EVENT_SELECTION, aSelectedID)
new invokerChecker(EVENT_SELECTION, aSelectedID),
],
[
new stateChangeChecker(STATE_SELECTED, false, true, aSelectedID),
new stateChangeChecker(STATE_SELECTED, false, false, aUnselectedID),
new invokerChecker(EVENT_SELECTION, aSelectedID)
]
new invokerChecker(EVENT_SELECTION, aSelectedID),
],
];
}
@ -1930,7 +1930,7 @@ function selChangeSeq(aUnselectedID, aSelectedID) {
function selRemoveSeq(aUnselectedID) {
return [
new stateChangeChecker(STATE_SELECTED, false, false, aUnselectedID),
new invokerChecker(EVENT_SELECTION_REMOVE, aUnselectedID)
new invokerChecker(EVENT_SELECTION_REMOVE, aUnselectedID),
];
}
@ -1940,7 +1940,7 @@ function selRemoveSeq(aUnselectedID) {
function selAddSeq(aSelectedID) {
return [
new stateChangeChecker(STATE_SELECTED, false, true, aSelectedID),
new invokerChecker(EVENT_SELECTION_ADD, aSelectedID)
new invokerChecker(EVENT_SELECTION_ADD, aSelectedID),
];
}
@ -2027,7 +2027,7 @@ var gA11yEventObserver =
for (var index = 0; index < listenersArray.length; index++)
listenersArray[index].handleEvent(event);
}
},
};
function listenA11yEvents(aStartToListen) {
@ -2164,7 +2164,7 @@ var gLogger =
var endIdx = startIdx + aFeature.length;
return endIdx == gA11yEventDumpFeature.length ||
gA11yEventDumpFeature[endIdx] == ";";
}
},
};
@ -2194,7 +2194,7 @@ function sequenceItem(aProcessor, aEventType, aTarget, aItemID) {
getID: function invoker_getID() {
return aItemID;
},
eventSeq: [ new invokerChecker(aEventType, aTarget) ]
eventSeq: [ new invokerChecker(aEventType, aTarget) ],
};
this.queue.push(invoker);

View File

@ -26,7 +26,7 @@
this.dialogNode = getNode(aID);
this.eventSeq = [
new invokerChecker(EVENT_DOCUMENT_LOAD_COMPLETE, this.dialogNode)
new invokerChecker(EVENT_DOCUMENT_LOAD_COMPLETE, this.dialogNode),
];
this.invoke = function showARIADialog_invoke() {

View File

@ -41,8 +41,8 @@
// creation, there are no events we could use to catch it.
let { state, isEnabled } = aEvent.QueryInterface(nsIAccessibleStateChangeEvent);
return state & STATE_BUSY && !isEnabled;
}
}
},
},
];
this.invoke = () => (this.DOMNode.style.visibility = "visible");

View File

@ -29,7 +29,7 @@
this.eventSeq = [
new invokerChecker(EVENT_REORDER, getAccessible(this.DOMNode)),
new asyncInvokerChecker(EVENT_DOCUMENT_LOAD_COMPLETE, getIframeDoc)
new asyncInvokerChecker(EVENT_DOCUMENT_LOAD_COMPLETE, getIframeDoc),
];
this.invoke = () => (this.DOMNode.src = aURL);
@ -40,9 +40,9 @@
children: [
{
role: ROLE_DOCUMENT,
name: aURL == "about:license" ? "Licenses" : aURL
}
]
name: aURL == "about:license" ? "Licenses" : aURL,
},
],
});
this.getID = () => `change iframe src on ${aURL}`;

View File

@ -32,7 +32,7 @@
this.eventSeq = [
new invokerChecker(aAction === kShow ? EVENT_SHOW : EVENT_HIDE, this.DOMNode),
new invokerChecker(EVENT_REORDER, this.IFrameContainerDOMNode)
new invokerChecker(EVENT_REORDER, this.IFrameContainerDOMNode),
];
this.invoke = () => {
@ -51,10 +51,10 @@
{
role: ROLE_INTERNAL_FRAME,
children: [
{ role: ROLE_DOCUMENT }
]
}
]
{ role: ROLE_DOCUMENT },
],
},
],
});
this.getID = () => {

View File

@ -46,12 +46,12 @@
role: ROLE_APP_ROOT,
children: [
{
role: ROLE_CHROME_WINDOW
role: ROLE_CHROME_WINDOW,
},
{
role: ROLE_CHROME_WINDOW
}
]
role: ROLE_CHROME_WINDOW,
},
],
};
testAccessibleTree(gRootAcc, accTree);

View File

@ -50,8 +50,8 @@
},
get targetDescr() {
return "inner iframe of docload_wnd.html document";
}
}
},
},
];
@ -62,12 +62,12 @@
role: ROLE_APP_ROOT,
children: [
{
role: ROLE_CHROME_WINDOW
role: ROLE_CHROME_WINDOW,
},
{
role: ROLE_CHROME_WINDOW
}
]
role: ROLE_CHROME_WINDOW,
},
],
};
testAccessibleTree(gRootAcc, accTree);

View File

@ -52,7 +52,7 @@
this.eventSeq = [
new invokerChecker(EVENT_SHOW, this.menuNode),
new invokerChecker(EVENT_REORDER, getNode(aParentMenuID)),
new invokerChecker(EVENT_MENUPOPUP_START, this.menuNode)
new invokerChecker(EVENT_MENUPOPUP_START, this.menuNode),
];
this.invoke = function showMenu_invoke() {
@ -76,7 +76,7 @@
this.eventSeq = [
new invokerChecker(EVENT_HIDE, getMenu, this),
new invokerChecker(EVENT_MENUPOPUP_END, getMenu, this),
new invokerChecker(EVENT_REORDER, getNode(aParentMenuID))
new invokerChecker(EVENT_REORDER, getNode(aParentMenuID)),
];
this.invoke = function closeMenu_invoke() {
@ -103,11 +103,11 @@
function focusInsideMenu(aMenuID, aMenuBarID) {
this.eventSeq = [
new invokerChecker(EVENT_FOCUS, getNode(aMenuID))
new invokerChecker(EVENT_FOCUS, getNode(aMenuID)),
];
this.unexpectedEventSeq = [
new invokerChecker(EVENT_MENU_END, getNode(aMenuBarID))
new invokerChecker(EVENT_MENU_END, getNode(aMenuBarID)),
];
this.invoke = function focusInsideMenu_invoke() {
@ -122,7 +122,7 @@
function blurMenu(aMenuBarID) {
var eventSeq = [
new invokerChecker(EVENT_MENU_END, getNode(aMenuBarID)),
new invokerChecker(EVENT_FOCUS, getNode("outsidemenu"))
new invokerChecker(EVENT_FOCUS, getNode("outsidemenu")),
];
this.__proto__ = new synthClick("outsidemenu", eventSeq);

View File

@ -42,7 +42,7 @@
this.eventSeq = [
new invokerChecker(EVENT_SHOW, this.fc),
new unexpectedInvokerChecker(EVENT_SHOW, this.owns)
new unexpectedInvokerChecker(EVENT_SHOW, this.owns),
];
this.invoke = function testAriaOwns_invoke() {
@ -76,7 +76,7 @@
this.eventSeq = [
new invokerChecker(EVENT_SHOW, this.fc),
new invokerChecker(EVENT_SHOW, this.sc),
new unexpectedInvokerChecker(EVENT_SHOW, this.owns)
new unexpectedInvokerChecker(EVENT_SHOW, this.owns),
];
this.invoke = function testAriaOwns_invoke() {

View File

@ -33,7 +33,7 @@
this.DOMNode = getNode(aID);
this.eventSeq = [
new expandedStateChecker(aIsExpanded, this.DOMNode)
new expandedStateChecker(aIsExpanded, this.DOMNode),
];
this.invoke = function expandNode_invoke() {
@ -50,7 +50,7 @@
this.DOMNode = getNode(aID);
this.eventSeq = [
new stateChangeChecker(STATE_BUSY, kOrdinalState, aIsBusy, this.DOMNode)
new stateChangeChecker(STATE_BUSY, kOrdinalState, aIsBusy, this.DOMNode),
];
this.invoke = function busyify_invoke() {
@ -66,7 +66,7 @@
this.DOMNode = getNode(aID);
this.eventSeq = [
new stateChangeChecker(EXT_STATE_CURRENT, true, aIsCurrent, this.DOMNode)
new stateChangeChecker(EXT_STATE_CURRENT, true, aIsCurrent, this.DOMNode),
];
this.invoke = function makeCurrent_invoke() {
@ -83,7 +83,7 @@
this.eventSeq = [
new stateChangeChecker(aState, kOrdinalState,
aValue == "true", this.DOMNode)
aValue == "true", this.DOMNode),
];
if (hasState(aID, STATE_MIXED) || aValue == "mixed") {

View File

@ -26,7 +26,7 @@
new textChangeChecker("container", 6, 11, "world", false, undefined, true),
new orderChecker(),
new textChangeChecker("container", 0, 1, "a", true, undefined, true),
new textChangeChecker("container", 7, 8, "b", true, undefined, true)
new textChangeChecker("container", 7, 8, "b", true, undefined, true),
];
this.invoke = function changeMultipleElements_invoke() {

View File

@ -26,7 +26,7 @@
new textChangeChecker("div2", 0, 5, "world", false, undefined, true),
new orderChecker(),
new textChangeChecker("div1", 0, 1, "a", true, undefined, true),
new textChangeChecker("div2", 0, 1, "b", true, undefined, true)
new textChangeChecker("div2", 0, 1, "b", true, undefined, true),
];
this.invoke = function changeMultipleElements_invoke() {

View File

@ -121,13 +121,13 @@
var eventType = this.getEventType(aParentAction);
this.eventSeq = [
new invokerChecker(eventType, this.parentNode),
new invokerChecker(EVENT_REORDER, this.hostNode)
new invokerChecker(EVENT_REORDER, this.hostNode),
];
// unexpected events
this.unexpectedEventSeq = [
new invokerChecker(this.getEventType(aChildAction), this.childNode),
new invokerChecker(EVENT_REORDER, this.parentNode)
new invokerChecker(EVENT_REORDER, this.parentNode),
];
};
}
@ -298,7 +298,7 @@
new invokerChecker(EVENT_REORDER, getNode(aParentId).parentNode),
new unexpectedInvokerChecker(EVENT_HIDE, getAccessible(aChild1Id)),
new unexpectedInvokerChecker(EVENT_HIDE, getAccessible(aChild2Id)),
new unexpectedInvokerChecker(EVENT_REORDER, getAccessible(aParentId))
new unexpectedInvokerChecker(EVENT_REORDER, getAccessible(aParentId)),
];
this.invoke = function removeGrandChildrenNHideParent_invoke() {
@ -323,7 +323,7 @@
new invokerChecker(EVENT_HIDE, this.o),
new invokerChecker(EVENT_REORDER, "t3_lb"),
new unexpectedInvokerChecker(EVENT_HIDE, this.ofc),
new unexpectedInvokerChecker(EVENT_REORDER, this.o)
new unexpectedInvokerChecker(EVENT_REORDER, this.o),
];
this.invoke = function test3_invoke() {
@ -356,7 +356,7 @@
new invokerChecker(EVENT_REORDER, "t4_lb"),
new unexpectedInvokerChecker(EVENT_HIDE, this.o2fc),
new unexpectedInvokerChecker(EVENT_REORDER, this.o1),
new unexpectedInvokerChecker(EVENT_REORDER, this.o2)
new unexpectedInvokerChecker(EVENT_REORDER, this.o2),
];
this.invoke = function test4_invoke() {
@ -391,7 +391,7 @@
new invokerChecker(EVENT_REORDER, "t5"),
new unexpectedInvokerChecker(EVENT_HIDE, this.ofc),
new unexpectedInvokerChecker(EVENT_REORDER, this.o),
new unexpectedInvokerChecker(EVENT_REORDER, this.lb)
new unexpectedInvokerChecker(EVENT_REORDER, this.lb),
];
this.invoke = function test5_invoke() {
@ -435,7 +435,7 @@
new unexpectedInvokerChecker(EVENT_REORDER, this.fc),
new unexpectedInvokerChecker(EVENT_REORDER, this.sc),
new unexpectedInvokerChecker(EVENT_HIDE, this.owns),
new unexpectedInvokerChecker(EVENT_SHOW, this.owns)
new unexpectedInvokerChecker(EVENT_SHOW, this.owns),
];
this.invoke = function test6_invoke() {
@ -469,7 +469,7 @@
new unexpectedInvokerChecker(EVENT_REORDER, getNode("t7_c_directchild")),
new unexpectedInvokerChecker(EVENT_REORDER, getNode("t7_c_grandchild")),
new unexpectedInvokerChecker(EVENT_SHOW, () => getNode("t7_c_directchild").firstChild),
new unexpectedInvokerChecker(EVENT_SHOW, () => getNode("t7_c_grandchild").firstChild)
new unexpectedInvokerChecker(EVENT_SHOW, () => getNode("t7_c_grandchild").firstChild),
];
this.invoke = function test7_invoke() {
@ -543,7 +543,7 @@
new invokerChecker(EVENT_REORDER, "t9_c3"),
new invokerChecker(EVENT_REORDER, "t9_c2"),
new invokerChecker(EVENT_REORDER, "t9_c1"),
new unexpectedInvokerChecker(EVENT_SHOW, "t9_c3_moved")
new unexpectedInvokerChecker(EVENT_SHOW, "t9_c3_moved"),
];
this.invoke = function test9_invoke() {
@ -586,7 +586,7 @@
new invokerChecker(EVENT_SHOW, getNode("t10_c2_moved")),
new invokerChecker(EVENT_REORDER, "t10_c2"),
new invokerChecker(EVENT_REORDER, "t10_c1"),
new invokerChecker(EVENT_REORDER, "t10_c3")
new invokerChecker(EVENT_REORDER, "t10_c3"),
];
this.invoke = function test10_invoke() {
@ -622,7 +622,7 @@
new unexpectedInvokerChecker(EVENT_HIDE, "t11_c2_child"),
new unexpectedInvokerChecker(EVENT_REORDER, "t11_c1"),
new unexpectedInvokerChecker(EVENT_REORDER, "t11_c2"),
new unexpectedInvokerChecker(EVENT_REORDER, "t11_c3")
new unexpectedInvokerChecker(EVENT_REORDER, "t11_c3"),
];
this.invoke = function test11_invoke() {

View File

@ -42,7 +42,7 @@
function selectMenuItem() {
this.eventSeq = [
new invokerChecker(EVENT_FOCUS, getFocusedMenuItem)
new invokerChecker(EVENT_FOCUS, getFocusedMenuItem),
];
this.invoke = function selectMenuItem_invoke() {
@ -57,7 +57,7 @@
function closeContextMenu(aID) {
this.eventSeq = [
new invokerChecker(EVENT_MENUPOPUP_END,
getAccessible(getContextMenuNode()))
getAccessible(getContextMenuNode())),
];
this.invoke = function closeContextMenu_invoke() {

View File

@ -43,7 +43,7 @@
this.count++;
},
count: 0
count: 0,
};
function doTests() {

View File

@ -24,7 +24,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=429547
function changeARIAActiveDescendant(aID, aItemID) {
this.eventSeq = [
new focusChecker(aItemID)
new focusChecker(aItemID),
];
this.invoke = function changeARIAActiveDescendant_invoke() {
@ -38,7 +38,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=429547
function clearARIAActiveDescendant(aID) {
this.eventSeq = [
new focusChecker(aID)
new focusChecker(aID),
];
this.invoke = function clearARIAActiveDescendant_invoke() {
@ -60,7 +60,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=429547
}
this.eventSeq = [
new focusChecker(aID)
new focusChecker(aID),
];
this.invoke = function changeARIAActiveDescendant_invoke() {
@ -75,7 +75,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=429547
function insertItemNFocus(aID, aNewItemID) {
this.eventSeq = [
new invokerChecker(EVENT_SHOW, aNewItemID),
new focusChecker(aNewItemID)
new focusChecker(aNewItemID),
];
this.invoke = function insertItemNFocus_invoke() {
@ -107,7 +107,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=429547
*/
function moveARIAActiveDescendantID(aFromID, aToID) {
this.eventSeq = [
new focusChecker(aToID)
new focusChecker(aToID),
];
this.invoke = function moveARIAActiveDescendantID_invoke() {

View File

@ -29,11 +29,11 @@
};
this.eventSeq = [
new focusChecker(this.DOMNode)
new focusChecker(this.DOMNode),
];
this.unexpectedEventSeq = [
new invokerChecker(EVENT_FOCUS, this.DOMNode.ownerDocument)
new invokerChecker(EVENT_FOCUS, this.DOMNode.ownerDocument),
];
this.getID = function focusElmWhileSubdocIsFocused_getID() {

View File

@ -39,7 +39,7 @@
gTooltipElm.style.display = "block";
elm.setAttribute("aria-describedby", "tooltip");
}
},
};
var gBlurHandler = {
@ -49,7 +49,7 @@
var elm = aEvent.target;
if (elm.nodeType == Node.ELEMENT_NODE)
elm.removeAttribute("aria-describedby");
}
},
};
/**

View File

@ -25,7 +25,7 @@
this.DOMNode = getNode(aID);
this.eventSeq = [
new textChangeChecker(aID, aStart, aEnd, aText, false, aFromUser)
new textChangeChecker(aID, aStart, aEnd, aText, false, aFromUser),
];
this.invoke = function removeTextFromInput_invoke() {
@ -48,7 +48,7 @@
this.DOMNode = getNode(aID);
this.eventSeq = [
new textChangeChecker(aID, aStart, aEnd, aText, false, aFromUser)
new textChangeChecker(aID, aStart, aEnd, aText, false, aFromUser),
];
this.invoke = function removeTextFromContentEditable_invoke() {

View File

@ -233,7 +233,7 @@
this.eventSeq = [
new invokerChecker(EVENT_SHOW, this.divNode),
new invokerChecker(EVENT_REORDER, this.containerNode)
new invokerChecker(EVENT_REORDER, this.containerNode),
];
this.invoke = function test1_invoke() {
@ -263,11 +263,11 @@
this.eventSeq = [
new invokerChecker(EVENT_SHOW, this.divNode),
new invokerChecker(EVENT_REORDER, this.containerNode)
new invokerChecker(EVENT_REORDER, this.containerNode),
];
this.unexpectedEventSeq = [
new invokerChecker(EVENT_REORDER, this.tmpContainerNode)
new invokerChecker(EVENT_REORDER, this.tmpContainerNode),
];
this.invoke = function test2_invoke() {
@ -294,7 +294,7 @@
this.unexpectedEventSeq = [
new invokerChecker(EVENT_SHOW, this.divNode),
new invokerChecker(EVENT_HIDE, this.divNode),
new invokerChecker(EVENT_REORDER, this.containerNode)
new invokerChecker(EVENT_REORDER, this.containerNode),
];
this.invoke = function test3_invoke() {
@ -314,7 +314,7 @@
this.eventSeq = [
new invokerChecker(EVENT_SHOW, function(aNode) { return aNode.firstChild; }, this.containerNode),
new invokerChecker(EVENT_SHOW, function(aNode) { return aNode.lastChild; }, this.containerNode),
new invokerChecker(EVENT_REORDER, this.containerNode)
new invokerChecker(EVENT_REORDER, this.containerNode),
];
this.invoke = function insertReferredElm_invoke() {
@ -335,7 +335,7 @@
this.eventSeq = [
new invokerChecker(EVENT_HIDE, getNode("c4_child")),
new invokerChecker(EVENT_SHOW, getNode("c4_middle")),
new invokerChecker(EVENT_REORDER, getNode("c4"))
new invokerChecker(EVENT_REORDER, getNode("c4")),
];
this.invoke = function showHiddenParentOfVisibleChild_invoke() {
@ -350,7 +350,7 @@
function hideNDestroyDoc() {
this.txt = null;
this.eventSeq = [
new invokerChecker(EVENT_HIDE, () => { return this.txt; })
new invokerChecker(EVENT_HIDE, () => { return this.txt; }),
];
this.invoke = function hideNDestroyDoc_invoke() {
@ -370,7 +370,7 @@
function hideHideNDestroyDoc() {
this.target = null;
this.eventSeq = [
new invokerChecker(EVENT_HIDE, () => { return this.target; })
new invokerChecker(EVENT_HIDE, () => { return this.target; }),
];
this.invoke = function hideHideNDestroyDoc_invoke() {

View File

@ -39,7 +39,7 @@
this.eventSeq = [
new invokerChecker(EVENT_SHOW, getButtonFromBinding, this.containerNode),
new invokerChecker(EVENT_REORDER, this.containerNode)
new invokerChecker(EVENT_REORDER, this.containerNode),
];
this.invoke = function insertBinding_invoke() {

View File

@ -41,7 +41,7 @@
function setAttr_recreate(aID, aAttr, aValue) {
this.eventSeq = [
new invokerChecker(EVENT_HIDE, getAccessible(aID)),
new invokerChecker(EVENT_SHOW, aID)
new invokerChecker(EVENT_SHOW, aID),
];
this.invoke = function setAttr_recreate_invoke() {
todo(false, "No accessible recreation should happen, just name change event");

View File

@ -29,7 +29,7 @@
this.itemNode = getNode(aItemID);
this.eventSeq = [
new invokerChecker(EVENT_SELECTION, aItemID)
new invokerChecker(EVENT_SELECTION, aItemID),
];
this.invoke = function selectItem_invoke() {

View File

@ -74,7 +74,7 @@
this.DOMNode = getNode(aID);
this.eventSeq = [
new stateChangeChecker(STATE_CHECKED, false, aIsChecked, this.DOMNode)
new stateChangeChecker(STATE_CHECKED, false, aIsChecked, this.DOMNode),
];
this.invoke = function changeCheckInput_invoke() {
@ -100,7 +100,7 @@
this.eventSeq = [
new stateChangeChecker(aState, aIsExtraState, aIsEnabled, this.fileControl),
new stateChangeChecker(aState, aIsExtraState, aIsEnabled, this.browseButton)
new stateChangeChecker(aState, aIsExtraState, aIsEnabled, this.browseButton),
];
this.getID = function stateChangeOnFileInput_getID() {
@ -111,7 +111,7 @@
function dupeStateChange(aID, aAttr, aValue,
aState, aIsExtraState, aIsEnabled) {
this.eventSeq = [
new stateChangeChecker(aState, aIsExtraState, aIsEnabled, getNode(aID))
new stateChangeChecker(aState, aIsExtraState, aIsEnabled, getNode(aID)),
];
this.invoke = function dupeStateChange_invoke() {
@ -128,7 +128,7 @@
this.eventSeq = [ ];
this.unexpectedEventSeq = [
new stateChangeChecker(aState, aIsExtraState, false, getNode(aID)),
new stateChangeChecker(aState, aIsExtraState, true, getNode(aID))
new stateChangeChecker(aState, aIsExtraState, true, getNode(aID)),
];
this.invoke = function oppositeStateChange_invoke() {
@ -147,7 +147,7 @@
function echoingStateChange(aID, aARIAAttr, aAttr, aValue,
aState, aIsExtraState, aIsEnabled) {
this.eventSeq = [
new stateChangeChecker(aState, aIsExtraState, aIsEnabled, getNode(aID))
new stateChangeChecker(aState, aIsExtraState, aIsEnabled, getNode(aID)),
];
this.invoke = function echoingStateChange_invoke() {

View File

@ -27,7 +27,7 @@
this.DOMNode = getNode(aID);
this.eventSeq = [
new textChangeChecker(aID, aStart, aEnd, aText, false)
new textChangeChecker(aID, aStart, aEnd, aText, false),
];
}
@ -35,7 +35,7 @@
this.DOMNode = getNode(aID);
this.eventSeq = [
new textChangeChecker(aID, aStart, aEnd, aText, true)
new textChangeChecker(aID, aStart, aEnd, aText, true),
];
}

View File

@ -82,7 +82,7 @@
[ kRemoval, "w", 0 ], // wqrema -> qrema
[ kInsertion, "t", 0], // qrema -> tqrema
[ kRemoval, "rema", 2 ], // tqrema -> tq
[ kInsertion, "b", 2] // tq -> tqb
[ kInsertion, "b", 2], // tq -> tqb
];
gQueue.push(new changeText("p1", "tqb", events));
@ -91,7 +91,7 @@
events = [
[ kRemoval, "b", 0 ], // b ->
[ kInsertion, "insa", 0] // -> insa
[ kInsertion, "insa", 0], // -> insa
];
gQueue.push(new changeText("p2", "insa", events));
@ -100,7 +100,7 @@
events = [
[ kRemoval, "abc", 0 ], // abc ->
[ kInsertion, "def", 0] // -> def
[ kInsertion, "def", 0], // -> def
];
gQueue.push(new changeText("p3", "def", events));
@ -108,7 +108,7 @@
// abcabc -> abcDEFabc: coalesced insertions
events = [
[ kInsertion, "DEF", 3] // abcabc -> abcDEFabc
[ kInsertion, "DEF", 3], // abcabc -> abcDEFabc
];
gQueue.push(new changeText("p4", "abcDEFabc", events));
@ -116,7 +116,7 @@
// abc -> defabc: insertion into begin
events = [
[ kInsertion, "def", 0] // abc -> defabc
[ kInsertion, "def", 0], // abc -> defabc
];
gQueue.push(new changeText("p5", "defabc", events));
@ -124,7 +124,7 @@
// abc -> abcdef: insertion into end
events = [
[ kInsertion, "def", 3] // abc -> abcdef
[ kInsertion, "def", 3], // abc -> abcdef
];
gQueue.push(new changeText("p6", "abcdef", events));
@ -132,7 +132,7 @@
// defabc -> abc: removal from begin
events = [
[ kRemoval, "def", 0] // defabc -> abc
[ kRemoval, "def", 0], // defabc -> abc
];
gQueue.push(new changeText("p7", "abc", events));
@ -140,7 +140,7 @@
// abcdef -> abc: removal from the end
events = [
[ kRemoval, "def", 3] // abcdef -> abc
[ kRemoval, "def", 3], // abcdef -> abc
];
gQueue.push(new changeText("p8", "abc", events));
@ -148,7 +148,7 @@
// abcDEFabc -> abcabc: coalesced removals
events = [
[ kRemoval, "DEF", 3] // abcDEFabc -> abcabc
[ kRemoval, "DEF", 3], // abcDEFabc -> abcabc
];
gQueue.push(new changeText("p9", "abcabc", events));
@ -187,7 +187,7 @@
var newStr = "a" + longStr1 + "b", insStr = longStr1, rmStr = "";
events = [
[ kRemoval, rmStr, 1, kUnexpected ],
[ kInsertion, insStr, 1 ]
[ kInsertion, insStr, 1 ],
];
gQueue.push(new changeText("p12", newStr, events));
@ -196,7 +196,7 @@
rmStr = longStr1;
events = [
[ kRemoval, rmStr, 1 ],
[ kInsertion, insStr, 1]
[ kInsertion, insStr, 1],
];
gQueue.push(new changeText("p12", newStr, events));
@ -205,7 +205,7 @@
rmStr = longStr2;
events = [
[ kRemoval, rmStr, 1 ],
[ kInsertion, insStr, 1, kUnexpected ]
[ kInsertion, insStr, 1, kUnexpected ],
];
gQueue.push(new changeText("p12", newStr, events));

View File

@ -30,7 +30,7 @@
this.DOMNode = getNode(aID);
this.eventSeq = [
new invokerChecker(EVENT_TEXT_ATTRIBUTE_CHANGED, this.DOMNode)
new invokerChecker(EVENT_TEXT_ATTRIBUTE_CHANGED, this.DOMNode),
];
this.invoke = function spelledTextInvoker_invoke() {
@ -52,7 +52,7 @@
var attrs = { };
var misspelledAttrs = {
"invalid": "spelling"
"invalid": "spelling",
};
testTextAttrs(aID, 0, attrs, defAttrs, 0, 11);

View File

@ -27,7 +27,7 @@
function getOnclickSeq(aID) {
return [
new caretMoveChecker(0, aID),
new unexpectedInvokerChecker(EVENT_TEXT_SELECTION_CHANGED, aID)
new unexpectedInvokerChecker(EVENT_TEXT_SELECTION_CHANGED, aID),
];
}

View File

@ -30,7 +30,7 @@
this.DOMNode = getNode(aNodeOrID);
this.eventSeq = [ new invokerChecker(aValuetext ?
EVENT_TEXT_VALUE_CHANGE :
EVENT_VALUE_CHANGE, this.DOMNode)
EVENT_VALUE_CHANGE, this.DOMNode),
];
this.invoke = function changeARIAValue_invoke() {
@ -64,7 +64,7 @@
function changeValue(aID, aValue) {
this.DOMNode = getNode(aID);
this.eventSeq = [new invokerChecker(EVENT_TEXT_VALUE_CHANGE,
this.DOMNode)
this.DOMNode),
];
this.invoke = function changeValue_invoke() {

View File

@ -49,7 +49,7 @@
var hitcanvas = getAccessible("hitcanvas");
var hitcheck = getAccessible("hitcheck");
var [hitX, hitY, /* hitWidth, hitHeight */] = getBounds(hitcanvas);
var [hitX, hitY /* hitWidth, hitHeight */] = getBounds(hitcanvas);
var [deltaX, deltaY] = CSSToDevicePixels(window, offsetX, offsetY);
var docAcc = getAccessible(document);

View File

@ -25,8 +25,8 @@
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({
set: [
["dom.webcomponents.shadowdom.enabled", true]
]
["dom.webcomponents.shadowdom.enabled", true],
],
}, function() {
// This test loads in an iframe, to ensure that the element instance is
// loaded with the correct value of the preference.

View File

@ -19,7 +19,7 @@
this.containerNode = getNode(aContainerID);
this.eventSeq = [
new invokerChecker(EVENT_REORDER, this.containerNode)
new invokerChecker(EVENT_REORDER, this.containerNode),
];
this.invoke = function addLinks_invoke() {
@ -60,7 +60,7 @@
this.textLen = this.textNode.data.length;
this.eventSeq = [
new invokerChecker(EVENT_TEXT_INSERTED, this.containerNode)
new invokerChecker(EVENT_TEXT_INSERTED, this.containerNode),
];
this.invoke = function updateText_invoke() {
@ -93,7 +93,7 @@
"Wrong text before child removal");
this.eventSeq = [
new invokerChecker(EVENT_REORDER, this.containerNode)
new invokerChecker(EVENT_REORDER, this.containerNode),
];
this.invoke = function removeChild_invoke() {
@ -115,7 +115,7 @@
function removeFirstChild(aContainer) {
this.ht = getAccessible(aContainer, [ nsIAccessibleHyperText ]);
this.eventSeq = [
new invokerChecker(EVENT_REORDER, aContainer)
new invokerChecker(EVENT_REORDER, aContainer),
];
this.invoke = function removeFirstChild_invoke() {
@ -138,7 +138,7 @@
function removeLastChild(aContainer) {
this.ht = getAccessible(aContainer, [ nsIAccessibleHyperText ]);
this.eventSeq = [
new invokerChecker(EVENT_REORDER, aContainer)
new invokerChecker(EVENT_REORDER, aContainer),
];
this.invoke = function removeLastChild_invoke() {

View File

@ -23,7 +23,7 @@ const MovementGranularity = {
CHARACTER: 1,
WORD: 2,
LINE: 4,
PARAGRAPH: 8
PARAGRAPH: 8,
};
var AccessFuTest = {
@ -45,7 +45,7 @@ var AccessFuTest = {
return;
}
aListenerFunc.apply(listener);
}
},
};
Services.console.registerListener(listener);
return listener;
@ -160,7 +160,7 @@ var AccessFuTest = {
AccessFuTest.finish();
}
});
}
},
};
class AccessFuContentTestRunner {
@ -275,8 +275,8 @@ class AccessFuContentTestRunner {
data: {
inputType: "gesture",
origin: "top",
...aArgs
}
...aArgs,
},
});
}, ...aExpectedEvents);
}
@ -313,8 +313,8 @@ class AccessFuContentTestRunner {
this.sendMessage({
name: "AccessFu:ClearCursor",
data: {
origin: "top"
}
origin: "top",
},
});
});
}
@ -324,8 +324,8 @@ class AccessFuContentTestRunner {
this.sendMessage({
name: "AccessFuTest:Focus",
data: {
selector: aSelector
}
selector: aSelector,
},
});
}, ...aExpectedEvents);
}
@ -342,8 +342,8 @@ class AccessFuContentTestRunner {
name: "AccessFu:Activate",
data: {
origin: "top",
offset: aOffset
}
offset: aOffset,
},
});
}, ...aExpectedEvents);
}
@ -370,14 +370,14 @@ class AccessFuContentTestRunner {
androidScrollForward() {
this.sendMessage({
name: "AccessFu:AndroidScroll",
data: { origin: "top", direction: "forward" }
data: { origin: "top", direction: "forward" },
});
}
androidScrollBackward() {
this.sendMessage({
name: "AccessFu:AndroidScroll",
data: { origin: "top", direction: "backward" }
data: { origin: "top", direction: "backward" },
});
}
@ -387,8 +387,8 @@ class AccessFuContentTestRunner {
name: "AccessFu:MoveByGranularity",
data: {
direction: aDirection,
granularity: aGranularity
}
granularity: aGranularity,
},
});
}, ...aExpectedEvents);
}

View File

@ -464,8 +464,8 @@
["dom.ipc.browser_frames.oop_by_default", true],
["dom.mozBrowserFramesEnabled", true],
["browser.pagethumbnails.capturing_disabled", true]
]
["browser.pagethumbnails.capturing_disabled", true],
],
}, doTest);
},
getRootDirectory(window.location.href) + "doc_content_integration.html");

View File

@ -16,55 +16,55 @@
// Test the following accOrElmOrID.
var tests = [{
accOrElmOrID: "anchor1",
expected: [{"string": "link"}, "title"]
expected: [{"string": "link"}, "title"],
}, {
accOrElmOrID: "anchor2",
expected: [{"string": "link"}, "This is a link"]
expected: [{"string": "link"}, "This is a link"],
}, {
accOrElmOrID: "button1",
expected: [{"string": "pushbutton"}, "Press me"]
expected: [{"string": "pushbutton"}, "Press me"],
}, {
accOrElmOrID: "button2",
expected: [{"string": "pushbutton"}, "Press me"]
expected: [{"string": "pushbutton"}, "Press me"],
}, {
accOrElmOrID: "textarea1",
expected: [{"string": "textarea"}, "This is the text area text.",
"Test Text Area"]
"Test Text Area"],
}, {
accOrElmOrID: "textarea2",
expected: [{"string": "textarea"}, "This is the text area text."]
expected: [{"string": "textarea"}, "This is the text area text."],
}, {
accOrElmOrID: "heading1",
expected: [{"string": "headingLevel", "args": [1]}, "Test heading",
"This is the heading."]
"This is the heading."],
}, {
accOrElmOrID: "heading1",
oldAccOrElmOrID: null,
expected: [null /* parent doc title */, document.title,
{"string": "headingLevel", "args": [1]}, "Test heading",
"This is the heading."]
"This is the heading."],
}, {
accOrElmOrID: "heading2",
expected: [{"string": "headingLevel", "args": [1]},
"This is the heading."]
"This is the heading."],
}, {
accOrElmOrID: "list",
expected: [{"string": "list"}, {"string": "listItemsCount", "count": 2},
"Test List", {"string": "listStart"}, "Top of the list",
{"string": "listEnd"}, "2.", "list two"]
{"string": "listEnd"}, "2.", "list two"],
}, {
accOrElmOrID: "dlist",
expected: [{"string": "definitionlist"},
{"string": "listItemsCount", "count": 0.5}, "Test Definition List",
"dd one"]
"dd one"],
}, {
accOrElmOrID: "li_one",
expected: [{"string": "list"}, {"string": "listItemsCount", "count": 2},
"Test List", {"string": "listStart"}, "Top of the list"]
"Test List", {"string": "listStart"}, "Top of the list"],
}, {
accOrElmOrID: "li_two",
expected: [{"string": "list"}, {"string": "listItemsCount", "count": 2},
"Test List", {"string": "listEnd"}, "2.", "list two"]
"Test List", {"string": "listEnd"}, "2.", "list two"],
}, {
accOrElmOrID: "cell",
expected: [{"string": "table"},
@ -76,30 +76,30 @@
{"string": "listStart"}, {"string": "link"}, "Apples",
{"string": "link"}, "Bananas",
{"string": "link"}, "Peaches", {"string": "listEnd"},
{"string": "link"}, "Plums"]
{"string": "link"}, "Plums"],
}, {
accOrElmOrID: "app.net",
expected: [{"string": "list"}, {"string": "listItemsCount", "count": 2},
{"string": "listStart"}, {"string": "link"}, "star",
{"string": "listEnd"}, {"string": "link"}, "repost"]
{"string": "listEnd"}, {"string": "link"}, "repost"],
}, {
// Test pivot to list from li_one.
accOrElmOrID: "list",
oldAccOrElmOrID: "li_one",
expected: [{"string": "list"}, {"string": "listItemsCount", "count": 2},
"Test List", {"string": "listStart"}, "Top of the list",
{"string": "listEnd"}, "2.", "list two"]
{"string": "listEnd"}, "2.", "list two"],
}, {
// Test pivot to li_one from list.
accOrElmOrID: "li_one",
oldAccOrElmOrID: "list",
expected: [{"string": "listStart"}, "Top of the list"]
expected: [{"string": "listStart"}, "Top of the list"],
}, {
// Test pivot to "apples" link from the table cell.
accOrElmOrID: "apples",
oldAccOrElmOrID: "cell",
expected: [{"string": "list"}, {"string": "listItemsCount", "count": 4},
{"string": "listStart"}, {"string": "link"}, "Apples"]
{"string": "listStart"}, {"string": "link"}, "Apples"],
}, {
// Test pivot to the table cell from the "apples" link.
accOrElmOrID: "cell",
@ -108,7 +108,7 @@
{"string": "listItemsCount", "count": 4}, {"string": "listStart"},
{"string": "link"}, "Apples", {"string": "link"}, "Bananas",
{"string": "link"}, "Peaches", {"string": "listEnd"},
{"string": "link"}, "Plums"]
{"string": "link"}, "Plums"],
}];
SpecialPowers.pushPrefEnv({"set": [[PREF_UTTERANCE_ORDER, 0]]}, function() {

View File

@ -15,37 +15,37 @@
function doTest() {
var tests = [{
accOrElmOrID: "can_wheel",
expectedHints: ["Swipe with two fingers to move between pages"]
expectedHints: ["Swipe with two fingers to move between pages"],
}, {
accOrElmOrID: "nested_link",
expectedHints: [{string: "link-hint"},
"Swipe with two fingers to move between pages"]
"Swipe with two fingers to move between pages"],
}, {
accOrElmOrID: "nested_link",
oldAccOrElmOrID: "can_wheel",
expectedHints: [{string: "link-hint"}]
expectedHints: [{string: "link-hint"}],
}, {
accOrElmOrID: "link_with_default_hint",
expectedHints: [{string: "link-hint"}]
expectedHints: [{string: "link-hint"}],
}, {
accOrElmOrID: "link_with_hint_override",
expectedHints: ["Tap and hold to get to menu"]
expectedHints: ["Tap and hold to get to menu"],
}, {
accOrElmOrID: "button_with_default_hint",
expectedHints: [{string: "pushbutton-hint"}]
expectedHints: [{string: "pushbutton-hint"}],
}, {
accOrElmOrID: "button_with_hint_override",
expectedHints: ["Tap and hold to activate"]
expectedHints: ["Tap and hold to activate"],
}, {
accOrElmOrID: "nested_link2",
expectedHints: [{string: "link-hint"}]
expectedHints: [{string: "link-hint"}],
}, {
accOrElmOrID: "nested_link3",
expectedHints: [{string: "link-hint"}, {string: "pushbutton-hint"},
"Double tap and hold to activate"]
"Double tap and hold to activate"],
}, {
accOrElmOrID: "menuitemradio",
expectedHints: [{string: "radiomenuitem-hint"}]
expectedHints: [{string: "radiomenuitem-hint"}],
}];
// Test hints.

View File

@ -21,13 +21,13 @@
expectedUtterance: [[{"string": "navigation"}, "a nav"],
["a nav", {"string": "navigation"}]],
expectedBraille: [[{"string": "navigation"}, "a nav"],
["a nav", {"string": "navigation"}]]
["a nav", {"string": "navigation"}]],
}, {
accOrElmOrID: "main",
expectedUtterance: [[{"string": "main"}, "a main area"],
["a main area", {"string": "main"}]],
expectedBraille: [[{"string": "main"}, "a main area"],
["a main area", {"string": "main"}]]
["a main area", {"string": "main"}]],
}, {
accOrElmOrID: "header",
expectedUtterance: [
@ -35,7 +35,7 @@
["a header", {"string": "header"}, {"string": "banner"}]],
expectedBraille: [
[{"string": "banner"}, {"string": "headerAbbr"}, "a header"],
["a header", {"string": "headerAbbr"}, {"string": "banner"}]]
["a header", {"string": "headerAbbr"}, {"string": "banner"}]],
}, {
accOrElmOrID: "footer",
expectedUtterance: [
@ -43,7 +43,7 @@
["a footer", {"string": "footer"}, {"string": "contentinfo"}]],
expectedBraille: [
[{"string": "contentinfo"}, {"string": "footerAbbr"}, "a footer"],
["a footer", {"string": "footerAbbr"}, {"string": "contentinfo"}]]
["a footer", {"string": "footerAbbr"}, {"string": "contentinfo"}]],
}, {
accOrElmOrID: "article_header",
expectedUtterance: [
@ -59,14 +59,14 @@
["a footer within an article"]],
expectedBraille: [
["a footer within an article"],
["a footer within an article"]]
["a footer within an article"]],
}, {
accOrElmOrID: "section_header",
expectedUtterance: [["a header within a section"],
["a header within a section"]],
expectedBraille: [
["a header within a section"],
["a header within a section"]]
["a header within a section"]],
}, {
accOrElmOrID: "section_footer",
expectedUtterance: [
@ -74,7 +74,7 @@
["a footer within a section"]],
expectedBraille: [
["a footer within a section"],
["a footer within a section"]]
["a footer within a section"]],
}, {
accOrElmOrID: "aside",
expectedUtterance: [
@ -82,13 +82,13 @@
["by the way I am an aside", {"string": "complementary"}]],
expectedBraille: [
[{"string": "complementary"}, "by the way I am an aside"],
["by the way I am an aside", {"string": "complementary"}]]
["by the way I am an aside", {"string": "complementary"}]],
}, {
accOrElmOrID: "main_element",
expectedUtterance: [[{"string": "main"}, "another main area"],
["another main area", {"string": "main"}]],
expectedBraille: [[{"string": "main"}, "another main area"],
["another main area", {"string": "main"}]]
["another main area", {"string": "main"}]],
}, {
accOrElmOrID: "complementary",
expectedUtterance: [[{"string": "list"},
@ -97,7 +97,7 @@
{"string": "listStart"}, {"string": "complementary"},
{"string": "list"}, {"string": "listItemsCount", "count": 1}]],
expectedBraille: [["*", {"string": "complementary"}, "A complementary"],
["*", "A complementary", {"string": "complementary"}]]
["*", "A complementary", {"string": "complementary"}]],
}, {
accOrElmOrID: "parent_main",
expectedUtterance: [[{"string": "main"}, "a parent main",
@ -107,7 +107,7 @@
expectedBraille: [[{"string": "main"}, "a parent main",
{"string": "complementary"}, "a child complementary"],
["a parent main", "a child complementary",
{"string": "complementary"}, {"string": "main"}]]
{"string": "complementary"}, {"string": "main"}]],
}, {
accOrElmOrID: "child_complementary",
expectedUtterance: [[{"string": "main"}, {"string": "complementary"},
@ -115,14 +115,14 @@
{"string": "complementary"}, {"string": "main"}]],
expectedBraille: [[{"string": "complementary"},
"a child complementary"], ["a child complementary",
{"string": "complementary"}]]
{"string": "complementary"}]],
}];
// Test outputs (utterance and braille) for landmarks.
function testOutputOrder(aOutputOrder) {
return function() {
SpecialPowers.pushPrefEnv({
"set": [[PREF_UTTERANCE_ORDER, aOutputOrder]]
"set": [[PREF_UTTERANCE_ORDER, aOutputOrder]],
}, function() {
tests.forEach(function run(test) {
testOutput(test.expectedUtterance[aOutputOrder], test.accOrElmOrID,

View File

@ -68,7 +68,7 @@
}],
action: function action() {
["to_hide1", "to_hide2", "to_hide3", "to_hide4"].forEach(id => hide(id));
}
},
}, {
expected: [{
"eventType": AndroidEvents.ANNOUNCEMENT,
@ -83,7 +83,7 @@
action: function action() {
["to_hide_descendant1", "to_hide_descendant2",
"to_hide_descendant3", "to_hide_descendant4"].forEach(id => hide(id));
}
},
}, {
expected: [{
"eventType": AndroidEvents.ANNOUNCEMENT,
@ -97,7 +97,7 @@
}],
action: function action() {
["to_show1", "to_show2", "to_show3", "to_show4"].forEach(id => show(id));
}
},
}, {
expected: [{
"eventType": AndroidEvents.ANNOUNCEMENT,
@ -112,7 +112,7 @@
action: function action() {
["to_show_descendant1", "to_show_descendant2",
"to_show_descendant3", "to_show_descendant4"].forEach(id => show(id));
}
},
}, {
expected: [{
"eventType": AndroidEvents.ANNOUNCEMENT,
@ -126,7 +126,7 @@
}],
action: function action() {
["to_hide5", "to_hide6", "to_hide7", "to_hide8", "to_hide9"].forEach(id => ariaHide(id));
}
},
}, {
expected: [{
"eventType": AndroidEvents.ANNOUNCEMENT,
@ -141,7 +141,7 @@
action: function action() {
["to_hide_descendant5", "to_hide_descendant6",
"to_hide_descendant7", "to_hide_descendant8"].forEach(id => ariaHide(id));
}
},
}, {
expected: [{
"eventType": AndroidEvents.ANNOUNCEMENT,
@ -155,7 +155,7 @@
}],
action: function action() {
["to_show5", "to_show6", "to_show7", "to_show8", "to_show9"].forEach(id => ariaShow(id));
}
},
}, {
expected: [{
"eventType": AndroidEvents.ANNOUNCEMENT,
@ -170,7 +170,7 @@
action: function action() {
["to_show_descendant5", "to_show_descendant6",
"to_show_descendant7", "to_show_descendant8"].forEach(id => ariaShow(id));
}
},
}, {
expected: [{
"eventType": AndroidEvents.ANNOUNCEMENT,
@ -184,7 +184,7 @@
}],
action: function action() {
hide("to_hide_live_assertive");
}
},
}, {
expected: [{
"eventType": AndroidEvents.ANNOUNCEMENT,
@ -198,7 +198,7 @@
}],
action: function action() {
ariaHide("to_hide_live_assertive2");
}
},
}, {
expected: [{
"eventType": AndroidEvents.ANNOUNCEMENT,
@ -212,7 +212,7 @@
}],
action: function action() {
["to_show_live_off", "to_show_live_assertive"].forEach(id => show(id));
}
},
}, {
expected: [{
"eventType": AndroidEvents.ANNOUNCEMENT,
@ -226,7 +226,7 @@
}],
action: function action() {
["to_show_live_off2", "to_show_live_assertive2"].forEach(id => ariaShow(id));
}
},
}, {
expected: [{
"eventType": AndroidEvents.ANNOUNCEMENT,
@ -240,7 +240,7 @@
}],
action: function action() {
updateText("text_add", "Text Added");
}
},
}, {
expected: [{
"eventType": AndroidEvents.ANNOUNCEMENT,
@ -254,7 +254,7 @@
}],
action: function action() {
updateHTML("text_add", "Text Added");
}
},
}, {
expected: [{
"eventType": AndroidEvents.ANNOUNCEMENT,
@ -268,7 +268,7 @@
}],
action: function action() {
updateText("text_remove", "");
}
},
}, {
expected: [{
"eventType": AndroidEvents.ANNOUNCEMENT,
@ -282,7 +282,7 @@
}],
action: function action() {
updateText("text_add_descendant", "Descendant Text Added");
}
},
}, {
expected: [{
"eventType": AndroidEvents.ANNOUNCEMENT,
@ -296,7 +296,7 @@
}],
action: function action() {
updateHTML("text_add_descendant", "Descendant Text Added");
}
},
}, {
expected: [{
"eventType": AndroidEvents.ANNOUNCEMENT,
@ -310,7 +310,7 @@
}],
action: function action() {
updateText("text_remove_descendant", "");
}
},
}, {
expected: [{
"eventType": AndroidEvents.ANNOUNCEMENT,
@ -324,7 +324,7 @@
}],
action: function action() {
updateText("text_add_descendant2", "Descendant Text Added");
}
},
}, {
expected: [{
"eventType": AndroidEvents.ANNOUNCEMENT,
@ -338,7 +338,7 @@
}],
action: function action() {
updateHTML("text_add_descendant2", "Descendant Text Added");
}
},
}, {
expected: [{
"eventType": AndroidEvents.ANNOUNCEMENT,
@ -352,7 +352,7 @@
}],
action: function action() {
updateText("text_remove_descendant2", "");
}
},
}, {
expected: [{
"eventType": AndroidEvents.ANNOUNCEMENT,
@ -367,7 +367,7 @@
action: function action() {
var child = document.getElementById("to_replace");
child.setAttribute("role", "main");
}
},
}, {
expected: [{
"eventType": AndroidEvents.ANNOUNCEMENT,
@ -381,7 +381,7 @@
}],
action: function action() {
updateText("to_replace_text", "I am a replaced text");
}
},
}, {
expected: [{
"eventType": AndroidEvents.ANNOUNCEMENT,
@ -395,7 +395,7 @@
}],
action: function action() {
updateHTML("to_replace_text", "I am a replaced text");
}
},
}];
function doTest() {

View File

@ -27,7 +27,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=753984
expectedUtterance: [[{"string": "link"}, "title"],
["title", {"string": "link"}]],
expectedBraille: [[{"string": "linkAbbr"}, "title"],
["title", {"string": "linkAbbr"}]]
["title", {"string": "linkAbbr"}]],
}, {
accOrElmOrID: "anchor_titleandtext",
expectedUtterance: [[{"string": "link"}, "goes to the tests",
@ -39,7 +39,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=753984
expectedUtterance: [[{"string": "link"}, "Tests"],
["Tests", {"string": "link"}]],
expectedBraille: [[{"string": "linkAbbr"}, "Tests"],
["Tests", {"string": "linkAbbr"}]]
["Tests", {"string": "linkAbbr"}]],
}, {
accOrElmOrID: "anchor_arialabelandtext",
expectedUtterance: [[{"string": "link"}, "goes to the tests - Tests"],
@ -61,42 +61,42 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=753984
"Test heading"], ["Test heading",
{"string": "headingLevel", "args": [1]}]],
expectedBraille: [[{"string": "headingAbbr"}, "Test heading"],
["Test heading", {"string": "headingAbbr"}]]
["Test heading", {"string": "headingAbbr"}]],
}, {
accOrElmOrID: "list",
expectedUtterance: [[{"string": "list"},
{"string": "listItemsCount", "count": 1}, {"string": "listStart"},
"1.", "list one"], ["1.", "list one", {"string": "listStart"},
{"string": "list"}, {"string": "listItemsCount", "count": 1}]
{"string": "list"}, {"string": "listItemsCount", "count": 1}],
],
expectedBraille: [[{"string": "listAbbr"}, "list one"],
["list one", {"string": "listAbbr"}]]
["list one", {"string": "listAbbr"}]],
}, {
accOrElmOrID: "dlist",
expectedUtterance: [[{"string": "definitionlist"},
{"string": "listItemsCount", "count": 0.5}, "dd one"], ["dd one",
{"string": "definitionlist"},
{"string": "listItemsCount", "count": 0.5}]
{"string": "listItemsCount", "count": 0.5}],
],
expectedBraille: [[{"string": "definitionlistAbbr"}, "dd one"],
["dd one", {"string": "definitionlistAbbr"}]]
["dd one", {"string": "definitionlistAbbr"}]],
}, {
accOrElmOrID: "li_one",
expectedUtterance: [[{"string": "list"},
{"string": "listItemsCount", "count": 1}, {"string": "listStart"},
"1.", "list one"], ["1.", "list one", {"string": "listStart"},
{"string": "list"}, {"string": "listItemsCount", "count": 1}]
{"string": "list"}, {"string": "listItemsCount", "count": 1}],
],
expectedBraille: [["1.", "list one"], ["1.", "list one"]]
expectedBraille: [["1.", "list one"], ["1.", "list one"]],
},
{
accOrElmOrID: "li_two",
expectedUtterance: [[{"string": "list"},
{"string": "listItemsCount", "count": 1}, {"string": "listStart"},
"list two"], ["list two", {"string": "listStart"},
{"string": "list"}, {"string": "listItemsCount", "count": 1}]
{"string": "list"}, {"string": "listItemsCount", "count": 1}],
],
expectedBraille: [["*", "list two"], ["*", "list two"]]
expectedBraille: [["*", "list two"], ["*", "list two"]],
}, {
accOrElmOrID: "cell",
expectedUtterance: [[{"string": "table"},
@ -123,7 +123,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=753984
{"string": "linkAbbr"}, "Bananas", {"string": "linkAbbr"},
"Peaches", {"string": "linkAbbr"}, "Plums", {"string": "linkAbbr"},
{"string": "listAbbr"},
{"string": "cellInfoAbbr", "args": [ 1, 1]}]]
{"string": "cellInfoAbbr", "args": [ 1, 1]}]],
}, {
accOrElmOrID: "email",
expectedUtterance: [[{"string": "textInputType_email"},
@ -131,7 +131,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=753984
{"string": "textInputType_email"}, {"string": "entry"}]],
expectedBraille: [[{"string": "textInputType_email"},
{"string": "entryAbbr"}, "test@example.com"], ["test@example.com",
{"string": "textInputType_email"}, {"string": "entryAbbr"}]]
{"string": "textInputType_email"}, {"string": "entryAbbr"}]],
}, {
accOrElmOrID: "search",
expectedUtterance: [[{"string": "textInputType_search"},
@ -139,7 +139,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=753984
{"string": "textInputType_search"}, {"string": "entry"}]],
expectedBraille: [[{"string": "textInputType_search"},
{"string": "entryAbbr"}, "This is a search"], ["This is a search",
{"string": "textInputType_search"}, {"string": "entryAbbr"}]]
{"string": "textInputType_search"}, {"string": "entryAbbr"}]],
}, {
accOrElmOrID: "tel",
expectedUtterance: [[{"string": "textInputType_tel"},
@ -147,7 +147,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=753984
{"string": "textInputType_tel"}, {"string": "entry"}]],
expectedBraille: [[{"string": "textInputType_tel"},
{"string": "entryAbbr"}, "555-5555"], ["555-5555",
{"string": "textInputType_tel"}, {"string": "entryAbbr"}]]
{"string": "textInputType_tel"}, {"string": "entryAbbr"}]],
}, {
accOrElmOrID: "url",
expectedUtterance: [[{"string": "textInputType_url"},
@ -156,13 +156,13 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=753984
expectedBraille: [[{"string": "textInputType_url"},
{"string": "entryAbbr"}, "http://example.com"],
["http://example.com", {"string": "textInputType_url"},
{"string": "entryAbbr"}]]
{"string": "entryAbbr"}]],
}, {
accOrElmOrID: "textInput",
expectedUtterance: [[{"string": "entry"}, "This is text."],
["This is text.", {"string": "entry"}]],
expectedBraille: [[{"string": "entryAbbr"}, "This is text."],
["This is text.", {"string": "entryAbbr"}]]
["This is text.", {"string": "entryAbbr"}]],
}, {
// Test pivot to list from li_one.
accOrElmOrID: "list",
@ -170,10 +170,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=753984
expectedUtterance: [[{"string": "list"},
{"string": "listItemsCount", "count": 1}, {"string": "listStart"},
"1.", "list one"], ["1.", "list one", {"string": "listStart"},
{"string": "list"}, {"string": "listItemsCount", "count": 1}]
{"string": "list"}, {"string": "listItemsCount", "count": 1}],
],
expectedBraille: [[{"string": "listAbbr"}, "list one"],
["list one", {"string": "listAbbr"}]]
["list one", {"string": "listAbbr"}]],
}, {
// Test pivot to "apples" link from the table cell.
accOrElmOrID: "apples",
@ -182,10 +182,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=753984
{"string": "listItemsCount", "count": 4}, {"string": "listStart"},
{"string": "link"}, "Apples"], ["Apples", {"string": "link"},
{"string": "listStart"}, {"string": "list"},
{"string": "listItemsCount", "count": 4}]
{"string": "listItemsCount", "count": 4}],
],
expectedBraille: [["*", {"string": "linkAbbr"}, "Apples"],
["*", "Apples", {"string": "linkAbbr"}]]
["*", "Apples", {"string": "linkAbbr"}]],
}, {
// Test pivot to "bananas" link from "apples" link.
accOrElmOrID: "bananas",
@ -193,7 +193,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=753984
expectedUtterance: [[{"string": "link"}, "Bananas"],
["Bananas", {"string": "link"}]],
expectedBraille: [["*", {"string": "linkAbbr"}, "Bananas"],
["*", "Bananas", {"string": "linkAbbr"}]]
["*", "Bananas", {"string": "linkAbbr"}]],
}, {
// test unavailable state utterance
accOrElmOrID: "unavailableButton",
@ -201,7 +201,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=753984
{"string": "pushbutton"}, "I am unavailable"], ["I am unavailable",
{"string": "stateUnavailable"}, {"string": "pushbutton"}]],
expectedBraille: [[{"string": "pushbuttonAbbr"}, "I am unavailable"],
["I am unavailable", {"string": "pushbuttonAbbr"}]]
["I am unavailable", {"string": "pushbuttonAbbr"}]],
}, {
// test expanded state utterance
accOrElmOrID: "expandedButton",
@ -209,7 +209,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=753984
{"string": "pushbutton"}, "I am expanded"], ["I am expanded",
{"string": "stateExpanded"}, {"string": "pushbutton"}]],
expectedBraille: [[{"string": "pushbuttonAbbr"}, "I am expanded"],
["I am expanded", {"string": "pushbuttonAbbr"}]]
["I am expanded", {"string": "pushbuttonAbbr"}]],
}, {
// test collapsed state utterance
accOrElmOrID: "collapsedButton",
@ -217,7 +217,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=753984
{"string": "pushbutton"}, "I am collapsed"], ["I am collapsed",
{"string": "stateCollapsed"}, {"string": "pushbutton"}]],
expectedBraille: [[{"string": "pushbuttonAbbr"}, "I am collapsed"],
["I am collapsed", {"string": "pushbuttonAbbr"}]]
["I am collapsed", {"string": "pushbuttonAbbr"}]],
}, {
// test required state utterance
accOrElmOrID: "requiredInput",
@ -225,7 +225,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=753984
"I am required"], ["I am required", {"string": "stateRequired"},
{"string": "entry"}]],
expectedBraille: [[{"string": "entryAbbr"}, "I am required"],
["I am required", {"string": "entryAbbr"}]]
["I am required", {"string": "entryAbbr"}]],
}, {
// test unavailable state utterance on inputs
accOrElmOrID: "readonlyInput",
@ -233,7 +233,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=753984
"No edits"], ["No edits", {"string": "stateReadonly"},
{"string": "entry"}]],
expectedBraille: [[{"string": "entryAbbr"}, "No edits"],
["No edits", {"string": "entryAbbr"}]]
["No edits", {"string": "entryAbbr"}]],
}, {
// test unavailable state utterance on textareas
accOrElmOrID: "readonlyTextarea",
@ -241,7 +241,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=753984
"No editing"], ["No editing", {"string": "stateReadonly"},
{"string": "textarea"}]],
expectedBraille: [[{"string": "textareaAbbr"}, "No editing"],
["No editing", {"string": "textareaAbbr"}]]
["No editing", {"string": "textareaAbbr"}]],
}, {
// test has popup state utterance
accOrElmOrID: "hasPopupButton",
@ -249,19 +249,19 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=753984
{"string": "buttonmenu"}, "I have a popup"], ["I have a popup",
{"string": "stateHasPopup"}, {"string": "buttonmenu"}]],
expectedBraille: [[{"string": "buttonmenuAbbr"}, "I have a popup"],
["I have a popup", {"string": "buttonmenuAbbr"}]]
["I have a popup", {"string": "buttonmenuAbbr"}]],
}, {
// Test selected tab
accOrElmOrID: "tab1",
expectedUtterance: [[{"string": "pagetablist"}, {"string": "pagetab"},
{"string": "objItemOfN", "args": [1, 2]}, "Account"], ["Account",
{"string": "pagetab"}, {"string": "objItemOfN", "args": [1, 2]},
{"string": "pagetablist"}]
{"string": "pagetablist"}],
],
expectedBraille: [[{"string": "pagetabAbbr"},
{"string": "objItemOfN", "args": [1, 2]}, "Account"], ["Account",
{"string": "pagetabAbbr"},
{"string": "objItemOfN", "args": [1, 2]}]]
{"string": "objItemOfN", "args": [1, 2]}]],
}, {
// Test unselected tab
accOrElmOrID: "tab2",
@ -272,13 +272,13 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=753984
expectedBraille: [[{"string": "pagetabAbbr"},
{"string": "objItemOfN", "args": [2, 2]}, "Advanced"], ["Advanced",
{"string": "pagetabAbbr"},
{"string": "objItemOfN", "args": [2, 2]}]]
{"string": "objItemOfN", "args": [2, 2]}]],
}, {
// Landing on this label should mimic landing on the checkbox.
accOrElmOrID: "label1",
expectedUtterance: [[{"string": "checkbutton"}, "Orange"], ["Orange",
{"string": "checkbutton"}]],
expectedBraille: [["Orange"], ["Orange"]]
expectedBraille: [["Orange"], ["Orange"]],
}, {
// Here we get a top-level view of the form.
accOrElmOrID: "form1",
@ -288,100 +288,100 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=753984
{"string": "checkbutton"}, "Blue", {"string": "label"}]],
expectedBraille: [[{"string": "labelAbbr"}, "Orange", "Orange", "Blue",
{"string": "labelAbbr"}, "Blue"], ["Orange", "Orange",
{"string": "labelAbbr"}, "Blue", "Blue", {"string": "labelAbbr"}]]
{"string": "labelAbbr"}, "Blue", "Blue", {"string": "labelAbbr"}]],
}, {
// This is a non-nesting label.
accOrElmOrID: "label2",
expectedUtterance: [[{"string": "label"}, "Blue"],
["Blue", {"string": "label"}]],
expectedBraille: [[{"string": "labelAbbr"}, "Blue"],
["Blue", {"string": "labelAbbr"}]]
["Blue", {"string": "labelAbbr"}]],
}, {
// This is a distinct control.
accOrElmOrID: "input2",
expectedUtterance: [[ {"string": "checkbutton"}, "Blue"],
["Blue", {"string": "checkbutton"}]],
expectedBraille: [["Blue"], ["Blue"]]
expectedBraille: [["Blue"], ["Blue"]],
}, {
// This is a nested control.
accOrElmOrID: "input1",
expectedUtterance: [[ {"string": "checkbutton"}, "Orange"], ["Orange",
{"string": "checkbutton"}]],
expectedBraille: [["Orange"], ["Orange"]]
expectedBraille: [["Orange"], ["Orange"]],
}, {
// Landing on this label should mimic landing on the entry.
accOrElmOrID: "label3",
expectedUtterance: [[{"string": "entry"}, "Joe", "First name:"],
["First name:", "Joe", {"string": "entry"}]],
expectedBraille: [[{"string": "entryAbbr"}, "Joe", "First name:"],
["First name:", "Joe", {"string": "entryAbbr"}]]
["First name:", "Joe", {"string": "entryAbbr"}]],
}, {
// This is a nested control with a value.
accOrElmOrID: "input3",
expectedUtterance: [[{"string": "entry"}, "Joe", "First name:"],
["First name:", "Joe", {"string": "entry"}]],
expectedBraille: [[{"string": "entryAbbr"}, "Joe", "First name:"],
["First name:", "Joe", {"string": "entryAbbr"}]]
["First name:", "Joe", {"string": "entryAbbr"}]],
}, {
// This is a nested control with a value.
accOrElmOrID: "input4",
expectedUtterance: [[{"string": "slider"}, "3", "Points:"],
["Points:", "3", {"string": "slider"}]],
expectedBraille: [[{"string": "sliderAbbr"}, "3", "Points:"],
["Points:", "3", {"string": "sliderAbbr"}]]
["Points:", "3", {"string": "sliderAbbr"}]],
}, {
accOrElmOrID: "password",
expectedUtterance: [[{"string": "passwordtext"}, "Secret Password"],
["Secret Password", {"string": "passwordtext"}]],
expectedBraille: [[{"string": "passwordtextAbbr"}, "Secret Password"],
["Secret Password", {"string": "passwordtextAbbr"}]]
["Secret Password", {"string": "passwordtextAbbr"}]],
}, {
accOrElmOrID: "input5",
expectedUtterance: [[{"string": "checkbutton"}, "Boring label"],
["Boring label", {"string": "checkbutton"}]],
expectedBraille: [["Boring label"], ["Boring label"]]
expectedBraille: [["Boring label"], ["Boring label"]],
}, {
accOrElmOrID: "radio_unselected",
expectedUtterance: [[{"string": "radiobutton"}, "any old radio button"],
["any old radio button", {"string": "radiobutton"}]
["any old radio button", {"string": "radiobutton"}],
],
expectedBraille: [["any old radio button"], ["any old radio button"]]
expectedBraille: [["any old radio button"], ["any old radio button"]],
}, {
accOrElmOrID: "radio_selected",
expectedUtterance: [[{"string": "radiobutton"}, "a unique radio button"],
["a unique radio button", {"string": "radiobutton"}]],
expectedBraille: [["a unique radio button"], ["a unique radio button"]]
expectedBraille: [["a unique radio button"], ["a unique radio button"]],
}, {
accOrElmOrID: "togglebutton_notpressed",
expectedUtterance: [[{"string": "togglebutton"}, "I am not pressed"],
["I am not pressed", {"string": "togglebutton"}]],
expectedBraille: [
[{"string": "stateUnpressedAbbr"}, "I am not pressed"],
["I am not pressed", {"string": "stateUnpressedAbbr"}]]
["I am not pressed", {"string": "stateUnpressedAbbr"}]],
}, {
accOrElmOrID: "togglebutton_pressed",
expectedUtterance: [[{"string": "statePressed"},
{"string": "togglebutton"}, "I am pressed!"], ["I am pressed!",
{"string": "statePressed"}, {"string": "togglebutton"}]],
expectedBraille: [[{"string": "statePressedAbbr"}, "I am pressed!"],
["I am pressed!", {"string": "statePressedAbbr"}]]
["I am pressed!", {"string": "statePressedAbbr"}]],
}, {
accOrElmOrID: "listbox-option",
expectedUtterance: [[{"string": "listbox"},
{"string": "listboxoption"}, "Search suggestion"],
["Search suggestion", {"string": "listboxoption"},
{"string": "listbox"}]
{"string": "listbox"}],
],
expectedBraille: [
[{"string": "listboxoptionAbbr"}, "Search suggestion"],
["Search suggestion", {"string": "listboxoptionAbbr"}]]
["Search suggestion", {"string": "listboxoptionAbbr"}]],
}, {
accOrElmOrID: "listbox-option2",
oldAccOrElmOrID: "listbox-option",
expectedUtterance: [[{"string": "listboxoption"}, "555-12345"],
["555-12345", {"string": "listboxoption"}]],
expectedBraille: [[{"string": "listboxoptionAbbr"}, "555-12345"],
["555-12345", {"string": "listboxoptionAbbr"}]]
["555-12345", {"string": "listboxoptionAbbr"}]],
}, {
accOrElmOrID: "columnheader",
oldAccOrElmOrID: "grid",
@ -390,7 +390,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=753984
{"string": "columnInfo", "args": [1]},
{"string": "rowInfo", "args": [1]}]],
expectedBraille: [[{"string": "cellInfoAbbr", "args": [1, 1]},
"Sunday"], ["Sunday", {"string": "cellInfoAbbr", "args": [1, 1]}]]
"Sunday"], ["Sunday", {"string": "cellInfoAbbr", "args": [1, 1]}]],
}, {
accOrElmOrID: "rowheader",
oldAccOrElmOrID: "grid",
@ -400,17 +400,17 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=753984
{"string": "rowInfo", "args": [2]}, "Sunday"]],
expectedBraille: [[{"string": "cellInfoAbbr", "args": [1, 2]},
"Sunday", "Week 1"], ["Week 1",
{"string": "cellInfoAbbr", "args": [1, 2]}, "Sunday"]]
{"string": "cellInfoAbbr", "args": [1, 2]}, "Sunday"]],
}, {
accOrElmOrID: "gridcell1",
oldAccOrElmOrID: "grid",
expectedUtterance: [["3"], ["3"]],
expectedBraille: [["3"], ["3"]]
expectedBraille: [["3"], ["3"]],
}, {
accOrElmOrID: "gridcell2",
oldAccOrElmOrID: "grid",
expectedUtterance: [["4", "7"], ["4", "7"]],
expectedBraille: [["4", "7"], ["4", "7"]]
expectedBraille: [["4", "7"], ["4", "7"]],
}, {
accOrElmOrID: "gridcell3",
oldAccOrElmOrID: "grid",
@ -423,21 +423,21 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=753984
"15 min", {"string": "stateCollapsed"}, {"string": "stateHasPopup"},
{"string": "combobox"}]],
expectedBraille: [[{"string": "comboboxAbbr"}, "15 min"], ["15 min",
{"string": "comboboxAbbr"}]]
{"string": "comboboxAbbr"}]],
}, {
accOrElmOrID: "selected-combobox-option",
oldAccOrElmOrID: "frequency",
expectedUtterance: [[{"string": "comboboxoption"}, "15 min"],
["15 min", {"string": "comboboxoption"}]],
expectedBraille: [[{"string": "comboboxoptionAbbr"}, "15 min"], [
"15 min", {"string": "comboboxoptionAbbr"}]]
"15 min", {"string": "comboboxoptionAbbr"}]],
}, {
accOrElmOrID: "combobox-option",
oldAccOrElmOrID: "frequency",
expectedUtterance: [[{"string": "comboboxoption"}, "30 min"], [
"30 min", {"string": "comboboxoption"}]],
expectedBraille: [[{"string": "comboboxoptionAbbr"}, "30 min"], [
"30 min", {"string": "comboboxoptionAbbr"}]]
"30 min", {"string": "comboboxoptionAbbr"}]],
}, {
accOrElmOrID: "labelled-combobox",
expectedUtterance: [[{"string": "stateCollapsed"},
@ -445,35 +445,35 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=753984
"Intervals"], ["Intervals", "Never", {"string": "stateCollapsed"},
{"string": "stateHasPopup"}, {"string": "combobox"}]],
expectedBraille: [[{"string": "comboboxAbbr"}, "Never", "Intervals"],
["Intervals", "Never", {"string": "comboboxAbbr"}]]
["Intervals", "Never", {"string": "comboboxAbbr"}]],
}, {
accOrElmOrID: "statusbar-1",
expectedUtterance: [["Last sync:", "2 days ago"],
["Last sync:", "2 days ago"]],
expectedBraille: [["Last sync:", "2 days ago"],
["Last sync:", "2 days ago"]]
["Last sync:", "2 days ago"]],
}, {
accOrElmOrID: "statusbar-2",
expectedUtterance: [["Last sync: 30min ago"],
["Last sync: 30min ago"]],
expectedBraille: [["Last sync: 30min ago"], ["Last sync: 30min ago"]]
expectedBraille: [["Last sync: 30min ago"], ["Last sync: 30min ago"]],
}, {
accOrElmOrID: "switch-1",
expectedUtterance: [[{"string": "switch"}, "Simple switch"],
["Simple switch", {"string": "switch"}]],
expectedBraille: [["Simple switch"], ["Simple switch"]]
expectedBraille: [["Simple switch"], ["Simple switch"]],
}, {
accOrElmOrID: "switch-2",
expectedUtterance: [[{"string": "switch"}, "Another switch"],
["Another switch", {"string": "switch"}]],
expectedBraille: [["Another switch"], ["Another switch"]]
expectedBraille: [["Another switch"], ["Another switch"]],
}];
// Test all possible utterance order preference values.
function testOutputOrder(aOutputOrder) {
return function() {
SpecialPowers.pushPrefEnv({
"set": [[PREF_UTTERANCE_ORDER, aOutputOrder]]
"set": [[PREF_UTTERANCE_ORDER, aOutputOrder]],
}, function() {
tests.forEach(function run(test) {
testOutput(test.expectedUtterance[aOutputOrder], test.accOrElmOrID,

View File

@ -20,159 +20,159 @@
accOrElmOrID: "math-1",
expectedUtterance: [
[{"string": "open-fence"}, "(", "x", ",", "y", {"string": "close-fence"}, ")"],
["(", {"string": "open-fence"}, "x", ",", "y", ")", {"string": "close-fence"}]
["(", {"string": "open-fence"}, "x", ",", "y", ")", {"string": "close-fence"}],
],
expectedBraille: [
[{"string": "open-fenceAbbr"}, "(", "x", ",", "y", {"string": "close-fenceAbbr"}, ")"],
["(", {"string": "open-fenceAbbr"}, "x", ",", "y", ")", {"string": "close-fenceAbbr"}]
]
["(", {"string": "open-fenceAbbr"}, "x", ",", "y", ")", {"string": "close-fenceAbbr"}],
],
}, {
accOrElmOrID: "mfrac-1",
expectedUtterance: [
[{"string": "mathmlfraction"}, {"string": "numerator"}, "a", {"string": "denominator"}, "b"],
["a", {"string": "numerator"}, "b", {"string": "denominator"}, {"string": "mathmlfraction"}]
["a", {"string": "numerator"}, "b", {"string": "denominator"}, {"string": "mathmlfraction"}],
],
expectedBraille: [
[{"string": "mathmlfractionAbbr"}, {"string": "numeratorAbbr"}, "a", {"string": "denominatorAbbr"}, "b"],
["a", {"string": "numeratorAbbr"}, "b", {"string": "denominatorAbbr"}, {"string": "mathmlfractionAbbr"}]
]
["a", {"string": "numeratorAbbr"}, "b", {"string": "denominatorAbbr"}, {"string": "mathmlfractionAbbr"}],
],
}, {
accOrElmOrID: "mfrac-2",
expectedUtterance: [
[{"string": "mathmlfractionwithoutbar"}, {"string": "numerator"}, "a", {"string": "denominator"}, "b"],
["a", {"string": "numerator"}, "b", {"string": "denominator"}, {"string": "mathmlfractionwithoutbar"}]
["a", {"string": "numerator"}, "b", {"string": "denominator"}, {"string": "mathmlfractionwithoutbar"}],
],
expectedBraille: [
[{"string": "mathmlfractionwithoutbarAbbr"}, {"string": "numeratorAbbr"}, "a", {"string": "denominatorAbbr"}, "b"],
["a", {"string": "numeratorAbbr"}, "b", {"string": "denominatorAbbr"}, {"string": "mathmlfractionwithoutbarAbbr"}]
]
["a", {"string": "numeratorAbbr"}, "b", {"string": "denominatorAbbr"}, {"string": "mathmlfractionwithoutbarAbbr"}],
],
}, {
accOrElmOrID: "msub-1",
expectedUtterance: [
[{"string": "mathmlscripted"}, {"string": "base"}, "a", {"string": "subscript"}, "b"],
["a", {"string": "base"}, "b", {"string": "subscript"}, {"string": "mathmlscripted"}]
["a", {"string": "base"}, "b", {"string": "subscript"}, {"string": "mathmlscripted"}],
],
expectedBraille: [
[{"string": "mathmlscriptedAbbr"}, {"string": "baseAbbr"}, "a", {"string": "subscriptAbbr"}, "b"],
["a", {"string": "baseAbbr"}, "b", {"string": "subscriptAbbr"}, {"string": "mathmlscriptedAbbr"}]
]
["a", {"string": "baseAbbr"}, "b", {"string": "subscriptAbbr"}, {"string": "mathmlscriptedAbbr"}],
],
}, {
accOrElmOrID: "msup-1",
expectedUtterance: [
[{"string": "mathmlscripted"}, {"string": "base"}, "a", {"string": "superscript"}, "b"],
["a", {"string": "base"}, "b", {"string": "superscript"}, {"string": "mathmlscripted"}]
["a", {"string": "base"}, "b", {"string": "superscript"}, {"string": "mathmlscripted"}],
],
expectedBraille: [
[{"string": "mathmlscriptedAbbr"}, {"string": "baseAbbr"}, "a", {"string": "superscriptAbbr"}, "b"],
["a", {"string": "baseAbbr"}, "b", {"string": "superscriptAbbr"}, {"string": "mathmlscriptedAbbr"}]
]
["a", {"string": "baseAbbr"}, "b", {"string": "superscriptAbbr"}, {"string": "mathmlscriptedAbbr"}],
],
}, {
accOrElmOrID: "msubsup-1",
expectedUtterance: [
[{"string": "mathmlscripted"}, {"string": "base"}, "a", {"string": "subscript"}, "b", {"string": "superscript"}, "c"],
["a", {"string": "base"}, "b", {"string": "subscript"}, "c", {"string": "superscript"}, {"string": "mathmlscripted"}]
["a", {"string": "base"}, "b", {"string": "subscript"}, "c", {"string": "superscript"}, {"string": "mathmlscripted"}],
],
expectedBraille: [
[{"string": "mathmlscriptedAbbr"}, {"string": "baseAbbr"}, "a", {"string": "subscriptAbbr"}, "b", {"string": "superscriptAbbr"}, "c"],
["a", {"string": "baseAbbr"}, "b", {"string": "subscriptAbbr"}, "c", {"string": "superscriptAbbr"}, {"string": "mathmlscriptedAbbr"}]
]
["a", {"string": "baseAbbr"}, "b", {"string": "subscriptAbbr"}, "c", {"string": "superscriptAbbr"}, {"string": "mathmlscriptedAbbr"}],
],
}, {
accOrElmOrID: "mmultiscripts-1",
expectedUtterance: [
[{"string": "mathmlscripted"}, {"string": "base"}, "a", {"string": "subscript"}, "b", {"string": "superscript"}, "c", {"string": "superscript"}, "d", {"string": "presubscript"}, "e", {"string": "presubscript"}, "f", {"string": "presuperscript"}, "g"],
["a", {"string": "base"}, "b", {"string": "subscript"}, "c", {"string": "superscript"}, "d", {"string": "superscript"}, "e", {"string": "presubscript"}, "f", {"string": "presubscript"}, "g", {"string": "presuperscript"}, {"string": "mathmlscripted"}]
["a", {"string": "base"}, "b", {"string": "subscript"}, "c", {"string": "superscript"}, "d", {"string": "superscript"}, "e", {"string": "presubscript"}, "f", {"string": "presubscript"}, "g", {"string": "presuperscript"}, {"string": "mathmlscripted"}],
],
expectedBraille: [
[{"string": "mathmlscriptedAbbr"}, {"string": "baseAbbr"}, "a", {"string": "subscriptAbbr"}, "b", {"string": "superscriptAbbr"}, "c", {"string": "superscriptAbbr"}, "d", {"string": "presubscriptAbbr"}, "e", {"string": "presubscriptAbbr"}, "f", {"string": "presuperscriptAbbr"}, "g"],
["a", {"string": "baseAbbr"}, "b", {"string": "subscriptAbbr"}, "c", {"string": "superscriptAbbr"}, "d", {"string": "superscriptAbbr"}, "e", {"string": "presubscriptAbbr"}, "f", {"string": "presubscriptAbbr"}, "g", {"string": "presuperscriptAbbr"}, {"string": "mathmlscriptedAbbr"}]
]
["a", {"string": "baseAbbr"}, "b", {"string": "subscriptAbbr"}, "c", {"string": "superscriptAbbr"}, "d", {"string": "superscriptAbbr"}, "e", {"string": "presubscriptAbbr"}, "f", {"string": "presubscriptAbbr"}, "g", {"string": "presuperscriptAbbr"}, {"string": "mathmlscriptedAbbr"}],
],
}, {
accOrElmOrID: "munder-1",
expectedUtterance: [
[{"string": "mathmlscripted"}, {"string": "base"}, "a", {"string": "underscript"}, "b"],
["a", {"string": "base"}, "b", {"string": "underscript"}, {"string": "mathmlscripted"}]
["a", {"string": "base"}, "b", {"string": "underscript"}, {"string": "mathmlscripted"}],
],
expectedBraille: [
[{"string": "mathmlscriptedAbbr"}, {"string": "baseAbbr"}, "a", {"string": "underscriptAbbr"}, "b"],
["a", {"string": "baseAbbr"}, "b", {"string": "underscriptAbbr"}, {"string": "mathmlscriptedAbbr"}]
]
["a", {"string": "baseAbbr"}, "b", {"string": "underscriptAbbr"}, {"string": "mathmlscriptedAbbr"}],
],
}, {
accOrElmOrID: "mover-1",
expectedUtterance: [
[{"string": "mathmlscripted"}, {"string": "base"}, "a", {"string": "overscript"}, "b"],
["a", {"string": "base"}, "b", {"string": "overscript"}, {"string": "mathmlscripted"}]
["a", {"string": "base"}, "b", {"string": "overscript"}, {"string": "mathmlscripted"}],
],
expectedBraille: [
[{"string": "mathmlscriptedAbbr"}, {"string": "baseAbbr"}, "a", {"string": "overscriptAbbr"}, "b"],
["a", {"string": "baseAbbr"}, "b", {"string": "overscriptAbbr"}, {"string": "mathmlscriptedAbbr"}]
]
["a", {"string": "baseAbbr"}, "b", {"string": "overscriptAbbr"}, {"string": "mathmlscriptedAbbr"}],
],
}, {
accOrElmOrID: "munderover-1",
expectedUtterance: [
[{"string": "mathmlscripted"}, {"string": "base"}, "a", {"string": "underscript"}, "b", {"string": "overscript"}, "c"],
["a", {"string": "base"}, "b", {"string": "underscript"}, "c", {"string": "overscript"}, {"string": "mathmlscripted"}]
["a", {"string": "base"}, "b", {"string": "underscript"}, "c", {"string": "overscript"}, {"string": "mathmlscripted"}],
],
expectedBraille: [
[{"string": "mathmlscriptedAbbr"}, {"string": "baseAbbr"}, "a", {"string": "underscriptAbbr"}, "b", {"string": "overscriptAbbr"}, "c"],
["a", {"string": "baseAbbr"}, "b", {"string": "underscriptAbbr"}, "c", {"string": "overscriptAbbr"}, {"string": "mathmlscriptedAbbr"}]
]
["a", {"string": "baseAbbr"}, "b", {"string": "underscriptAbbr"}, "c", {"string": "overscriptAbbr"}, {"string": "mathmlscriptedAbbr"}],
],
}, {
accOrElmOrID: "mroot-1",
expectedUtterance: [
[{"string": "mathmlroot"}, {"string": "base"}, "a", {"string": "root-index"}, "b"],
["a", {"string": "base"}, "b", {"string": "root-index"}, {"string": "mathmlroot"}]
["a", {"string": "base"}, "b", {"string": "root-index"}, {"string": "mathmlroot"}],
],
expectedBraille: [
[{"string": "mathmlrootAbbr"}, {"string": "baseAbbr"}, "a", {"string": "root-indexAbbr"}, "b"],
["a", {"string": "baseAbbr"}, "b", {"string": "root-indexAbbr"}, {"string": "mathmlrootAbbr"}]
]
["a", {"string": "baseAbbr"}, "b", {"string": "root-indexAbbr"}, {"string": "mathmlrootAbbr"}],
],
}, {
accOrElmOrID: "mtable-1",
expectedUtterance: [
[{"string": "mathmltable"}, {"string": "tblColumnInfo", "count": 3}, {"string": "tblRowInfo", "count": 2}, {"string": "columnInfo", "args": [1]}, {"string": "rowInfo", "args": [1]}, "a", {"string": "columnInfo", "args": [2]}, {"string": "rowInfo", "args": [1]}, "b", {"string": "columnInfo", "args": [3]}, {"string": "rowInfo", "args": [1]}, "c", {"string": "columnInfo", "args": [1]}, {"string": "rowInfo", "args": [2]}, "d", {"string": "columnInfo", "args": [2]}, {"string": "rowInfo", "args": [2]}, "e", {"string": "columnInfo", "args": [3]}, {"string": "rowInfo", "args": [2]}, "f"],
["a", {"string": "columnInfo", "args": [1]}, {"string": "rowInfo", "args": [1]}, "b", {"string": "columnInfo", "args": [2]}, {"string": "rowInfo", "args": [1]}, "c", {"string": "columnInfo", "args": [3]}, {"string": "rowInfo", "args": [1]}, "d", {"string": "columnInfo", "args": [1]}, {"string": "rowInfo", "args": [2]}, "e", {"string": "columnInfo", "args": [2]}, {"string": "rowInfo", "args": [2]}, "f", {"string": "columnInfo", "args": [3]}, {"string": "rowInfo", "args": [2]}, {"string": "mathmltable"}, {"string": "tblColumnInfo", "count": 3}, {"string": "tblRowInfo", "count": 2}]
["a", {"string": "columnInfo", "args": [1]}, {"string": "rowInfo", "args": [1]}, "b", {"string": "columnInfo", "args": [2]}, {"string": "rowInfo", "args": [1]}, "c", {"string": "columnInfo", "args": [3]}, {"string": "rowInfo", "args": [1]}, "d", {"string": "columnInfo", "args": [1]}, {"string": "rowInfo", "args": [2]}, "e", {"string": "columnInfo", "args": [2]}, {"string": "rowInfo", "args": [2]}, "f", {"string": "columnInfo", "args": [3]}, {"string": "rowInfo", "args": [2]}, {"string": "mathmltable"}, {"string": "tblColumnInfo", "count": 3}, {"string": "tblRowInfo", "count": 2}],
],
expectedBraille: [
[{"string": "mathmltableAbbr"}, {"string": "tblColumnInfoAbbr", "count": 3}, {"string": "tblRowInfoAbbr", "count": 2}, {"string": "cellInfoAbbr", "args": [1, 1]}, "a", {"string": "cellInfoAbbr", "args": [2, 1]}, "b", {"string": "cellInfoAbbr", "args": [3, 1]}, "c", {"string": "cellInfoAbbr", "args": [1, 2]}, "d", {"string": "cellInfoAbbr", "args": [2, 2]}, "e", {"string": "cellInfoAbbr", "args": [3, 2]}, "f"],
["a", {"string": "cellInfoAbbr", "args": [1, 1]}, "b", {"string": "cellInfoAbbr", "args": [2, 1]}, "c", {"string": "cellInfoAbbr", "args": [3, 1]}, "d", {"string": "cellInfoAbbr", "args": [1, 2]}, "e", {"string": "cellInfoAbbr", "args": [2, 2]}, "f", {"string": "cellInfoAbbr", "args": [3, 2]}, {"string": "mathmltableAbbr"}, {"string": "tblColumnInfoAbbr", "count": 3}, {"string": "tblRowInfoAbbr", "count": 2}]
]
["a", {"string": "cellInfoAbbr", "args": [1, 1]}, "b", {"string": "cellInfoAbbr", "args": [2, 1]}, "c", {"string": "cellInfoAbbr", "args": [3, 1]}, "d", {"string": "cellInfoAbbr", "args": [1, 2]}, "e", {"string": "cellInfoAbbr", "args": [2, 2]}, "f", {"string": "cellInfoAbbr", "args": [3, 2]}, {"string": "mathmltableAbbr"}, {"string": "tblColumnInfoAbbr", "count": 3}, {"string": "tblRowInfoAbbr", "count": 2}],
],
}, {
accOrElmOrID: "menclose-1",
expectedUtterance: [
[{"string": "mathmlenclosed"}, {"string": "notation-longdiv"}, "a"],
["a", {"string": "notation-longdiv"}, {"string": "mathmlenclosed"}]
["a", {"string": "notation-longdiv"}, {"string": "mathmlenclosed"}],
],
expectedBraille: [
[{"string": "mathmlenclosedAbbr"}, {"string": "notation-longdivAbbr"}, "a"],
["a", {"string": "notation-longdivAbbr"}, {"string": "mathmlenclosedAbbr"}]
]
["a", {"string": "notation-longdivAbbr"}, {"string": "mathmlenclosedAbbr"}],
],
}, {
accOrElmOrID: "menclose-2",
expectedUtterance: [
[{"string": "mathmlenclosed"}, {"string": "notation-circle"}, "a"],
["a", {"string": "notation-circle"}, {"string": "mathmlenclosed"}]
["a", {"string": "notation-circle"}, {"string": "mathmlenclosed"}],
],
expectedBraille: [
[{"string": "mathmlenclosedAbbr"}, {"string": "notation-circleAbbr"}, "a"],
["a", {"string": "notation-circleAbbr"}, {"string": "mathmlenclosedAbbr"}]
]
["a", {"string": "notation-circleAbbr"}, {"string": "mathmlenclosedAbbr"}],
],
}, {
accOrElmOrID: "menclose-3",
expectedUtterance: [
[{"string": "mathmlenclosed"}, {"string": "notation-left"}, {"string": "notation-top"}, {"string": "notation-bottom"}, "a"],
["a", {"string": "notation-left"}, {"string": "notation-top"}, {"string": "notation-bottom"}, {"string": "mathmlenclosed"}]
["a", {"string": "notation-left"}, {"string": "notation-top"}, {"string": "notation-bottom"}, {"string": "mathmlenclosed"}],
],
expectedBraille: [
[{"string": "mathmlenclosedAbbr"}, {"string": "notation-leftAbbr"}, {"string": "notation-topAbbr"}, {"string": "notation-bottomAbbr"}, "a"],
["a", {"string": "notation-leftAbbr"}, {"string": "notation-topAbbr"}, {"string": "notation-bottomAbbr"}, {"string": "mathmlenclosedAbbr"}]
]
["a", {"string": "notation-leftAbbr"}, {"string": "notation-topAbbr"}, {"string": "notation-bottomAbbr"}, {"string": "mathmlenclosedAbbr"}],
],
}];
// Test all possible utterance order preference values.
function testOutputOrder(aOutputOrder) {
return function() {
SpecialPowers.pushPrefEnv({
"set": [[PREF_UTTERANCE_ORDER, aOutputOrder]]
"set": [[PREF_UTTERANCE_ORDER, aOutputOrder]],
}, function() {
tests.forEach(function run(test) {
testOutput(test.expectedUtterance[aOutputOrder], test.accOrElmOrID,

View File

@ -54,7 +54,7 @@
{"string": "cellInfoAbbr", "args": [2, 2]}, "col2",
{"string": "tableAbbr"},
{"string": "tblColumnInfoAbbr", "count": 2},
{"string": "tblRowInfoAbbr", "count": 2}]]
{"string": "tblRowInfoAbbr", "count": 2}]],
}, {
accOrElmOrID: "table2",
expectedUtterance: [[
@ -116,7 +116,7 @@
{"string": "cellInfoAbbr", "args": [2, 2]},
{"string": "tableAbbr"},
{"string": "tblColumnInfoAbbr", "count": 2},
{"string": "tblRowInfoAbbr", "count": 2}]]
{"string": "tblRowInfoAbbr", "count": 2}]],
}, {
accOrElmOrID: "table3",
expectedUtterance: [[
@ -155,7 +155,7 @@
{"string": "cellInfoAbbr", "args": [1, 2]}, "colheader",
{"string": "tableAbbr"},
{"string": "tblColumnInfoAbbr", "count": 1},
{"string": "tblRowInfoAbbr", "count": 2}]]
{"string": "tblRowInfoAbbr", "count": 2}]],
}, {
accOrElmOrID: "table4",
expectedUtterance: [[
@ -230,11 +230,11 @@
{"string": "cellInfoAbbr", "args": [3, 3]}, "col3", "row2",
{"string": "tableAbbr"},
{"string": "tblColumnInfoAbbr", "count": 4},
{"string": "tblRowInfoAbbr", "count": 3}]]
{"string": "tblRowInfoAbbr", "count": 3}]],
}, {
accOrElmOrID: "table5",
expectedUtterance: [["Row1", "Row2"], ["Row1", "Row2"]],
expectedBraille: [["Row1", "Row2"], ["Row1", "Row2"]]
expectedBraille: [["Row1", "Row2"], ["Row1", "Row2"]],
}, {
// Test pivot to table1_th1 from table1.
accOrElmOrID: "table1_th1",
@ -246,7 +246,7 @@
{"string": "rowInfo", "args": [1]}]],
expectedBraille: [[
{"string": "cellInfoAbbr", "args": [1, 1]}, "col1"], ["col1",
{"string": "cellInfoAbbr", "args": [1, 1]}]]
{"string": "cellInfoAbbr", "args": [1, 1]}]],
}, {
// Test pivot to table1_td2 from table1.
accOrElmOrID: "table1_td2",
@ -258,7 +258,7 @@
{"string": "rowInfo", "args": [2]}, "col2"]],
expectedBraille: [
[{"string": "cellInfoAbbr", "args": [2, 2]}, "col2", "cell2"],
["cell2", {"string": "cellInfoAbbr", "args": [2, 2]}, "col2"]]
["cell2", {"string": "cellInfoAbbr", "args": [2, 2]}, "col2"]],
}, {
// Test pivot to table1_td2 from table1_th1.
accOrElmOrID: "table1_td2",
@ -270,7 +270,7 @@
{"string": "rowInfo", "args": [2]}, "col2"]],
expectedBraille: [
[{"string": "cellInfoAbbr", "args": [2, 2]}, "col2", "cell2"],
["cell2", {"string": "cellInfoAbbr", "args": [2, 2]}, "col2"]]
["cell2", {"string": "cellInfoAbbr", "args": [2, 2]}, "col2"]],
}, {
// Test pivot to table1_td2 from table1_td1.
accOrElmOrID: "table1_td2",
@ -280,7 +280,7 @@
{"string": "columnInfo", "args": [2]}, "col2"]],
expectedBraille: [
[{"string": "cellInfoAbbr", "args": [2, 2]}, "col2", "cell2"],
["cell2", {"string": "cellInfoAbbr", "args": [2, 2]}, "col2"]]
["cell2", {"string": "cellInfoAbbr", "args": [2, 2]}, "col2"]],
}, {
// Test pivot to table2_cell_1 from table2.
accOrElmOrID: "table2_cell_1",
@ -292,7 +292,7 @@
{"string": "rowInfo", "args": [1]}, "col1"]],
expectedBraille: [
[{"string": "cellInfoAbbr", "args": [1, 1]}, "col1", "cell1"],
["cell1", {"string": "cellInfoAbbr", "args": [1, 1]}, "col1"]]
["cell1", {"string": "cellInfoAbbr", "args": [1, 1]}, "col1"]],
}, {
// Test pivot to table2_cell_2 from table2.
accOrElmOrID: "table2_cell_2",
@ -329,7 +329,7 @@
{"string": "tableAbbr"},
{"string": "tblColumnInfoAbbr", "count": 1},
{"string": "tblRowInfoAbbr", "count": 2},
{"string": "cellInfoAbbr", "args": [2, 1]}, "col2"]]
{"string": "cellInfoAbbr", "args": [2, 1]}, "col2"]],
}, {
// Test pivot to table2_cell_1 from table2_cell_2.
accOrElmOrID: "table2_cell_1",
@ -339,7 +339,7 @@
{"string": "columnInfo", "args": [1]}, "col1"]],
expectedBraille: [
[{"string": "cellInfoAbbr", "args": [1, 1]}, "col1", "cell1"],
["cell1", {"string": "cellInfoAbbr", "args": [1, 1]}, "col1"]]
["cell1", {"string": "cellInfoAbbr", "args": [1, 1]}, "col1"]],
}, {
// Test pivot to table3_cell from table2.
accOrElmOrID: "table3_cell",
@ -361,7 +361,7 @@
{"string": "rowInfo", "args": [1]}, "col2"]],
expectedBraille: [
[{"string": "cellInfoAbbr", "args": [1, 2]}, "colheader", "bla"],
["bla", {"string": "cellInfoAbbr", "args": [1, 2]}, "colheader"]]
["bla", {"string": "cellInfoAbbr", "args": [1, 2]}, "colheader"]],
}, {
// Test pivot to table3_cell from table2_cell_1.
accOrElmOrID: "table3_cell",
@ -382,7 +382,7 @@
{"string": "rowInfo", "args": [1]}, "col2"]],
expectedBraille: [
[{"string": "cellInfoAbbr", "args": [1, 2]}, "colheader", "bla"],
["bla", {"string": "cellInfoAbbr", "args": [1, 2]}, "colheader"]]
["bla", {"string": "cellInfoAbbr", "args": [1, 2]}, "colheader"]],
}, {
// Test pivot to table3_cell from table3_ch.
accOrElmOrID: "table3_cell",
@ -392,7 +392,7 @@
{"string": "rowInfo", "args": [2]}]],
expectedBraille: [
[{"string": "cellInfoAbbr", "args": [1, 2]}, "bla"],
["bla", {"string": "cellInfoAbbr", "args": [1, 2]}]]
["bla", {"string": "cellInfoAbbr", "args": [1, 2]}]],
}, {
// Test pivot to table3_cell from table1_td1.
accOrElmOrID: "table3_cell",
@ -420,7 +420,7 @@
{"string": "tblRowInfo", "count": 2}]],
expectedBraille: [
[{"string": "cellInfoAbbr", "args": [1, 2]}, "colheader", "bla"],
["bla", {"string": "cellInfoAbbr", "args": [1, 2]}, "colheader"]]
["bla", {"string": "cellInfoAbbr", "args": [1, 2]}, "colheader"]],
}, {
// Test pivot to table4_ch_3 from table4.
accOrElmOrID: "table4_ch_3",
@ -432,7 +432,7 @@
{"string": "rowInfo", "args": [1]}]],
expectedBraille: [
[{"string": "cellInfoAbbr", "args": [3, 1]}, "col3"],
["col3", {"string": "cellInfoAbbr", "args": [3, 1]}]]
["col3", {"string": "cellInfoAbbr", "args": [3, 1]}]],
}, {
// Test pivot to table4_rh_1 from table4_ch_3.
accOrElmOrID: "table4_rh_1",
@ -446,7 +446,7 @@
{"string": "spansColumns", "args": [2]}, "col1"]],
expectedBraille: [
[{"string": "cellInfoAbbr", "args": [1, 2]}, "col1", "row1"],
["row1", {"string": "cellInfoAbbr", "args": [1, 2]}, "col1"]]
["row1", {"string": "cellInfoAbbr", "args": [1, 2]}, "col1"]],
}, {
// Test pivot to table4_cell_3 from table4_rh_1.
accOrElmOrID: "table4_cell_3",
@ -458,7 +458,7 @@
{"string": "spansRows", "args": [2]}]],
expectedBraille: [
[{"string": "cellInfoAbbr", "args": [4, 2]}, "cell2"],
["cell2", {"string": "cellInfoAbbr", "args": [4, 2]}]]
["cell2", {"string": "cellInfoAbbr", "args": [4, 2]}]],
}, {
// Test pivot to table4_cell_5 from table4_cell_3.
accOrElmOrID: "table4_cell_5",
@ -471,7 +471,7 @@
{"string": "rowInfo", "args": [3]}, "col2", "row2"]],
expectedBraille: [
[{"string": "cellInfoAbbr", "args": [2, 3]}, "col2", "row2", "cell3"],
["cell3", {"string": "cellInfoAbbr", "args": [2, 3]}, "col2", "row2"]]
["cell3", {"string": "cellInfoAbbr", "args": [2, 3]}, "col2", "row2"]],
}];
// Test outputs (utterance and braille) for tables including their
@ -479,7 +479,7 @@
function testOutputOrder(aOutputOrder) {
return function() {
SpecialPowers.pushPrefEnv({
"set": [[PREF_UTTERANCE_ORDER, aOutputOrder]]
"set": [[PREF_UTTERANCE_ORDER, aOutputOrder]],
}, function() {
tests.forEach(function run(test) {
testOutput(test.expectedUtterance[aOutputOrder], test.accOrElmOrID,

View File

@ -97,7 +97,7 @@ var gTestIterator =
ruleIdx: -1,
elm: null,
container: null,
testID: ""
testID: "",
};
/**
@ -254,7 +254,7 @@ function testNameForElmRule(aElm, aRule) {
mLocalName: tagname,
mAttrName: attrname,
mAttrValue: aElm.getAttribute("id")
mAttrValue: aElm.getAttribute("id"),
};
var treeWalker = document.createTreeWalker(document.body,
@ -360,7 +360,7 @@ function evaluateXPath(aNode, aExpr, aResolver) {
function htmlDocResolver(aPrefix) {
var ns = {
"html": "http://www.w3.org/1999/xhtml"
"html": "http://www.w3.org/1999/xhtml",
};
return ns[aPrefix] || null;
}

View File

@ -21,7 +21,7 @@
*/
function bulletUpdate() {
this.eventSeq = [
new invokerChecker(EVENT_REORDER, getNode("list"))
new invokerChecker(EVENT_REORDER, getNode("list")),
];
this.invoke = function bulletUpdate_invoke() {

View File

@ -34,7 +34,7 @@ var HeadersTraversalRule =
return FILTER_MATCH;
},
QueryInterface: ChromeUtils.generateQI([nsIAccessibleTraversalRule])
QueryInterface: ChromeUtils.generateQI([nsIAccessibleTraversalRule]),
};
/**
@ -62,7 +62,7 @@ var ObjectTraversalRule =
return rv;
},
QueryInterface: ChromeUtils.generateQI([nsIAccessibleTraversalRule])
QueryInterface: ChromeUtils.generateQI([nsIAccessibleTraversalRule]),
};
// //////////////////////////////////////////////////////////////////////////////
@ -163,7 +163,7 @@ VCChangedChecker.methodReasonMap = {
"setTextRange": nsIAccessiblePivot.REASON_NONE,
"moveNextByText": nsIAccessiblePivot.REASON_NEXT,
"movePreviousByText": nsIAccessiblePivot.REASON_PREV,
"moveToPoint": nsIAccessiblePivot.REASON_POINT
"moveToPoint": nsIAccessiblePivot.REASON_POINT,
};
/**
@ -190,7 +190,7 @@ function setVCRangeInvoker(aDocAcc, aTextAccessible, aTextOffsets) {
};
this.eventSeq = [
new VCChangedChecker(aDocAcc, aTextAccessible, aTextOffsets, "setTextRange", true)
new VCChangedChecker(aDocAcc, aTextAccessible, aTextOffsets, "setTextRange", true),
];
}
@ -243,12 +243,12 @@ function setVCPosInvoker(aDocAcc, aPivotMoveMethod, aRule, aIdOrNameOrAcc,
if (expectMove) {
this.eventSeq = [
new VCChangedChecker(aDocAcc, aIdOrNameOrAcc, null, aPivotMoveMethod,
aIsFromUserInput === undefined ? !!aPivotMoveMethod : aIsFromUserInput)
aIsFromUserInput === undefined ? !!aPivotMoveMethod : aIsFromUserInput),
];
} else {
this.eventSeq = [];
this.unexpectedEventSeq = [
new invokerChecker(EVENT_VIRTUALCURSOR_CHANGED, aDocAcc)
new invokerChecker(EVENT_VIRTUALCURSOR_CHANGED, aDocAcc),
];
}
}
@ -290,12 +290,12 @@ function setVCTextInvoker(aDocAcc, aPivotMoveMethod, aBoundary, aTextOffsets,
if (expectMove) {
this.eventSeq = [
new VCChangedChecker(aDocAcc, aIdOrNameOrAcc, aTextOffsets, aPivotMoveMethod,
aIsFromUserInput === undefined ? true : aIsFromUserInput, aBoundary)
aIsFromUserInput === undefined ? true : aIsFromUserInput, aBoundary),
];
} else {
this.eventSeq = [];
this.unexpectedEventSeq = [
new invokerChecker(EVENT_VIRTUALCURSOR_CHANGED, aDocAcc)
new invokerChecker(EVENT_VIRTUALCURSOR_CHANGED, aDocAcc),
];
}
}
@ -333,12 +333,12 @@ function moveVCCoordInvoker(aDocAcc, aX, aY, aIgnoreNoMatch,
if (expectMove) {
this.eventSeq = [
new VCChangedChecker(aDocAcc, aIdOrNameOrAcc, null, "moveToPoint", true)
new VCChangedChecker(aDocAcc, aIdOrNameOrAcc, null, "moveToPoint", true),
];
} else {
this.eventSeq = [];
this.unexpectedEventSeq = [
new invokerChecker(EVENT_VIRTUALCURSOR_CHANGED, aDocAcc)
new invokerChecker(EVENT_VIRTUALCURSOR_CHANGED, aDocAcc),
];
}
}
@ -371,7 +371,7 @@ function setModalRootInvoker(aDocAcc, aModalRootAcc, aExpectedResult) {
this.eventSeq = [];
this.unexpectedEventSeq = [
new invokerChecker(EVENT_VIRTUALCURSOR_CHANGED, aDocAcc)
new invokerChecker(EVENT_VIRTUALCURSOR_CHANGED, aDocAcc),
];
}
@ -467,7 +467,7 @@ function removeVCPositionInvoker(aDocAcc, aPosNode) {
};
this.eventSeq = [
new removeVCPositionChecker(aDocAcc, this.accessible.parent)
new removeVCPositionChecker(aDocAcc, this.accessible.parent),
];
}
@ -510,7 +510,7 @@ function removeVCRootInvoker(aRootNode) {
};
this.eventSeq = [
new removeVCRootChecker(this.pivot)
new removeVCRootChecker(this.pivot),
];
}

View File

@ -36,8 +36,8 @@
type: EVENT_SHOW,
match(aEvent) {
return aEvent.accessible.role == ROLE_DIALOG;
}
}
},
},
];
this.invoke = function showAlert_invoke() {

View File

@ -51,7 +51,7 @@
function insertRelated(aHostRelAttr, aDependentID, aInsertHostFirst,
aHostRelation, aDependentRelation) {
this.eventSeq = [
new invokerChecker(EVENT_REORDER, document)
new invokerChecker(EVENT_REORDER, document),
];
this.invoke = function insertRelated_invoke() {
@ -94,7 +94,7 @@
this.eventSeq = [
new invokerChecker(EVENT_HIDE, this.container),
new invokerChecker(EVENT_SHOW, this.containerNode)
new invokerChecker(EVENT_SHOW, this.containerNode),
];
this.invoke = function recreateRelatives_invoke() {

View File

@ -21,7 +21,7 @@
function testScrollToPoint() {
// scrollToPoint relative screen
var anchor = getAccessible("bottom1");
let [x, /* y */] = getPos(anchor);
let [x /* y */] = getPos(anchor);
var [docX, docY] = getPos(document);
anchor.scrollToPoint(COORDTYPE_SCREEN_RELATIVE, docX, docY);
@ -29,7 +29,7 @@
// scrollToPoint relative window
anchor = getAccessible("bottom2");
[x, /* y */] = getPos(anchor);
[x /* y */] = getPos(anchor);
var wnd = getRootAccessible().DOMDocument.defaultView;
var [screenX, screenY] = CSSToDevicePixels(wnd, wnd.screenX, wnd.screenY);
let scrollToX = docX - screenX, scrollToY = docY - screenY;
@ -39,7 +39,7 @@
// scrollToPoint relative parent
anchor = getAccessible("bottom3");
[x, /* y */] = getPos(anchor);
[x /* y */] = getPos(anchor);
var [parentX, parentY] = getPos(anchor.parent);
scrollToX = parentX - docX;
scrollToY = parentY - docY;

View File

@ -50,7 +50,7 @@ function testIsItemSelected(aSelectAcc, aTraversedAcc, aIndexObj, aSelectedChild
var childCount = aTraversedAcc.childCount;
for (var idx = 0; idx < childCount; idx++) {
var child = aTraversedAcc.getChildAt(idx);
var [state, /* extraState */] = getStates(child);
var [state /* extraState */] = getStates(child);
if (state & STATE_SELECTABLE) {
var isSelected = false;
var len = aSelectedChildren.length;

View File

@ -33,7 +33,7 @@
if (!acc)
return;
var [state, /* extraState */] = getStates(aAccOrElmOrID);
var [state /* extraState */] = getStates(aAccOrElmOrID);
if (state & STATE_UNAVAILABLE) {
var role = getRole(acc);
if (role != ROLE_GROUPING) {

View File

@ -25,13 +25,13 @@
function loadFile() {
var eventSeq = [
new stateChangeChecker(STATE_BUSY, false, true, document, null, false, true),
new stateChangeChecker(STATE_BUSY, false, false, document)
new stateChangeChecker(STATE_BUSY, false, false, document),
];
defineScenario(this, eventSeq); // both events were fired
var unexpectedEventSeq = [
new stateChangeChecker(STATE_BUSY, false, true, document),
new stateChangeChecker(STATE_BUSY, false, false, document)
new stateChangeChecker(STATE_BUSY, false, false, document),
];
defineScenario(this, [], unexpectedEventSeq); // events were coalesced

View File

@ -26,7 +26,7 @@
this.comboboxOption = this.comboboxList.firstChild;
this.eventSeq = [
new invokerChecker(EVENT_FOCUS, this.comboboxOption)
new invokerChecker(EVENT_FOCUS, this.comboboxOption),
];
this.invoke = function openComboboxNCheckStates_invoke() {

View File

@ -23,7 +23,7 @@
this.childNode = null;
this.eventSeq = [
new invokerChecker(EVENT_REORDER, this.containerNode)
new invokerChecker(EVENT_REORDER, this.containerNode),
];
this.invoke = function addChild_invoke() {
@ -56,7 +56,7 @@
this.child = null;
this.eventSeq = [
new removeChildChecker(this)
new removeChildChecker(this),
];
this.invoke = function removeChild_invoke() {

View File

@ -59,7 +59,7 @@ function testTableStruct(aIdentifier, aCellsArray, aColHeaderType,
// Test table accessible tree.
var tableObj = {
children: []
children: [],
};
switch (aTableType) {
case kTable:
@ -80,9 +80,9 @@ function testTableStruct(aIdentifier, aCellsArray, aColHeaderType,
children: [
{
role: ROLE_TEXT_LEAF,
name: aCaption
}
]
name: aCaption,
},
],
};
tableObj.children.push(captionObj);
@ -92,19 +92,19 @@ function testTableStruct(aIdentifier, aCellsArray, aColHeaderType,
if (aColHeaderType) {
var headersObj = {
role: ROLE_LIST,
children: []
children: [],
};
for (let idx = 0; idx < colsCount; idx++) {
var headerCellObj = {
role: ROLE_COLUMNHEADER
role: ROLE_COLUMNHEADER,
};
headersObj.children.push(headerCellObj);
}
if (aColHeaderType == kTreeColumnHeader) {
var columnPickerObj = {
role: ROLE_PUSHBUTTON
role: ROLE_PUSHBUTTON,
};
headersObj.children.push(columnPickerObj);
@ -117,7 +117,7 @@ function testTableStruct(aIdentifier, aCellsArray, aColHeaderType,
for (let rowIdx = 0; rowIdx < rowCount; rowIdx++) {
let rowObj = {
role: aRowRoles ? aRowRoles[rowIdx] : ROLE_ROW,
children: []
children: [],
};
for (let colIdx = 0; colIdx < colsCount; colIdx++) {

View File

@ -23,7 +23,7 @@
// only display:table
var accTree =
{ SECTION: [
{ TEXT_LEAF: [ ] }
{ TEXT_LEAF: [ ] },
] };
testAccessibleTree("table1", accTree);
@ -31,8 +31,8 @@
accTree =
{ SECTION: [
{ SECTION: [
{ TEXT_LEAF: [ ] }
] }
{ TEXT_LEAF: [ ] },
] },
] };
testAccessibleTree("table2", accTree);
@ -40,8 +40,8 @@
accTree =
{ SECTION: [
{ SECTION: [
{ TEXT_LEAF: [ ] }
] }
{ TEXT_LEAF: [ ] },
] },
] };
testAccessibleTree("table3", accTree);
@ -49,8 +49,8 @@
accTree =
{ SECTION: [
{ SECTION: [
{ TEXT_LEAF: [ ] }
] }
{ TEXT_LEAF: [ ] },
] },
] };
testAccessibleTree("table4", accTree);
@ -58,8 +58,8 @@
accTree =
{ TEXT_CONTAINER: [
{ TEXT_CONTAINER: [
{ TEXT_LEAF: [ ] }
] }
{ TEXT_LEAF: [ ] },
] },
] };
testAccessibleTree("table5", accTree);

View File

@ -24,33 +24,33 @@
{
cell: "table_dc_1",
rowHeaderCells: [ "table_rh_1" ],
columnHeaderCells: [ "table_ch_2" ]
columnHeaderCells: [ "table_ch_2" ],
},
{
cell: "table_dc_2",
rowHeaderCells: [ "table_rh_1" ],
columnHeaderCells: [ "table_ch_3" ]
columnHeaderCells: [ "table_ch_3" ],
},
{
cell: "table_dc_3",
rowHeaderCells: [ "table_rh_2" ],
columnHeaderCells: [ "table_ch_2" ]
columnHeaderCells: [ "table_ch_2" ],
},
{
cell: "table_dc_4",
rowHeaderCells: [ "table_rh_2" ],
columnHeaderCells: [ "table_ch_3" ]
columnHeaderCells: [ "table_ch_3" ],
},
{
cell: "table_rh_1",
rowHeaderCells: [],
columnHeaderCells: [ "table_ch_1" ]
columnHeaderCells: [ "table_ch_1" ],
},
{
cell: "table_rh_2",
rowHeaderCells: [],
columnHeaderCells: [ "table_ch_1" ]
}
columnHeaderCells: [ "table_ch_1" ],
},
];
testHeaderCells(headerInfoMap);
@ -64,14 +64,14 @@
// not focusable cell (ARIAGridCellAccessible is used)
cell: "table2_dc_1",
rowHeaderCells: [],
columnHeaderCells: [ "table2_ch_1" ]
columnHeaderCells: [ "table2_ch_1" ],
},
{
// focusable cell (ARIAGridCellAccessible is used)
cell: "table2_dc_2",
rowHeaderCells: [],
columnHeaderCells: [ "table2_ch_2" ]
}
columnHeaderCells: [ "table2_ch_2" ],
},
];
testHeaderCells(headerInfoMap);
@ -85,14 +85,14 @@
// ARIAGridCellAccessible is used
cell: "t3_dc_1",
rowHeaderCells: [ "t3_rh_1" ],
columnHeaderCells: [ ]
columnHeaderCells: [ ],
},
{
// ARIAGridCellAccessible is used (inside rowgroup)
cell: "t3_dc_2",
rowHeaderCells: [ "t3_rh_2" ],
columnHeaderCells: [ ]
}
columnHeaderCells: [ ],
},
];
testHeaderCells(headerInfoMap);

View File

@ -24,33 +24,33 @@
{
cell: "table_dc_1",
rowHeaderCells: [ "table_rh_1" ],
columnHeaderCells: [ "table_ch_2" ]
columnHeaderCells: [ "table_ch_2" ],
},
{
cell: "table_dc_2",
rowHeaderCells: [ "table_rh_1" ],
columnHeaderCells: [ "table_ch_3" ]
columnHeaderCells: [ "table_ch_3" ],
},
{
cell: "table_dc_3",
rowHeaderCells: [ "table_rh_2" ],
columnHeaderCells: [ "table_ch_2" ]
columnHeaderCells: [ "table_ch_2" ],
},
{
cell: "table_dc_4",
rowHeaderCells: [ "table_rh_2" ],
columnHeaderCells: [ "table_ch_3" ]
columnHeaderCells: [ "table_ch_3" ],
},
{
cell: "table_rh_1",
rowHeaderCells: [],
columnHeaderCells: [ "table_ch_1" ]
columnHeaderCells: [ "table_ch_1" ],
},
{
cell: "table_rh_2",
rowHeaderCells: [],
columnHeaderCells: [ "table_ch_1" ]
}
columnHeaderCells: [ "table_ch_1" ],
},
];
testHeaderCells(headerInfoMap);

View File

@ -24,38 +24,38 @@
{
cell: "table1_cell_1",
rowHeaderCells: [],
columnHeaderCells: [ "table1_weekday", "table1_date" ]
columnHeaderCells: [ "table1_weekday", "table1_date" ],
},
{
cell: "table1_cell_2",
rowHeaderCells: [],
columnHeaderCells: [ "table1_day", "table1_date" ]
columnHeaderCells: [ "table1_day", "table1_date" ],
},
{
cell: "table1_cell_3",
rowHeaderCells: [],
columnHeaderCells: [ "table1_qty" ]
columnHeaderCells: [ "table1_qty" ],
},
{
cell: "table1_cell_4",
rowHeaderCells: [],
columnHeaderCells: [ "table1_weekday", "table1_date" ]
columnHeaderCells: [ "table1_weekday", "table1_date" ],
},
{
cell: "table1_cell_5",
rowHeaderCells: [],
columnHeaderCells: [ "table1_day", "table1_date" ]
columnHeaderCells: [ "table1_day", "table1_date" ],
},
{
cell: "table1_cell_6",
rowHeaderCells: [],
columnHeaderCells: [ "table1_qty" ]
columnHeaderCells: [ "table1_qty" ],
},
{
cell: "table1_cell_7",
rowHeaderCells: [ "table1_total" ],
columnHeaderCells: [ "table1_qty" ]
}
columnHeaderCells: [ "table1_qty" ],
},
];
testHeaderCells(headerInfoMap);
@ -67,33 +67,33 @@
{
cell: "table2_cell_2",
rowHeaderCells: [ "table2_rh_1" ],
columnHeaderCells: [ "table2_ch_2" ]
columnHeaderCells: [ "table2_ch_2" ],
},
{
cell: "table2_cell_3",
rowHeaderCells: [ "table2_rh_1" ],
columnHeaderCells: [ "table2_ch_3" ]
columnHeaderCells: [ "table2_ch_3" ],
},
{
cell: "table2_cell_5",
rowHeaderCells: [ "table2_rh_2" ],
columnHeaderCells: [ "table2_ch_2" ]
columnHeaderCells: [ "table2_ch_2" ],
},
{
cell: "table2_cell_6",
rowHeaderCells: [ "table2_rh_2" ],
columnHeaderCells: [ "table2_ch_3" ]
columnHeaderCells: [ "table2_ch_3" ],
},
{
cell: "table2_rh_1",
rowHeaderCells: [],
columnHeaderCells: [ "table2_ch_1" ]
columnHeaderCells: [ "table2_ch_1" ],
},
{
cell: "table2_rh_2",
rowHeaderCells: [],
columnHeaderCells: [ "table2_ch_1" ]
}
columnHeaderCells: [ "table2_ch_1" ],
},
];
testHeaderCells(headerInfoMap);
@ -105,13 +105,13 @@
{
cell: "table3_cell_1",
rowHeaderCells: [],
columnHeaderCells: [ "table3_ch_1" ]
columnHeaderCells: [ "table3_ch_1" ],
},
{
cell: "table3_cell_2",
rowHeaderCells: [],
columnHeaderCells: [ "table3_ch_2" ]
}
columnHeaderCells: [ "table3_ch_2" ],
},
];
testHeaderCells(headerInfoMap);
@ -123,8 +123,8 @@
{
cell: "table4_cell",
rowHeaderCells: [],
columnHeaderCells: [ "table4_ch" ]
}
columnHeaderCells: [ "table4_ch" ],
},
];
testHeaderCells(headerInfoMap);
@ -136,8 +136,8 @@
{
cell: "table5_cell",
rowHeaderCells: [ "table5_rh" ],
columnHeaderCells: [ ]
}
columnHeaderCells: [ ],
},
];
testHeaderCells(headerInfoMap);
@ -149,8 +149,8 @@
{
cell: "table6_cell",
rowHeaderCells: [ "table6_rh" ],
columnHeaderCells: [ "table6_ch" ]
}
columnHeaderCells: [ "table6_ch" ],
},
];
testHeaderCells(headerInfoMap);
@ -162,63 +162,63 @@
{
cell: "t7_r1c1",
rowHeaderCells: [ "t7_Mary", "t7_Females" ],
columnHeaderCells: [ "t7_1km" ]
columnHeaderCells: [ "t7_1km" ],
},
{
cell: "t7_r1c2",
rowHeaderCells: [ "t7_Mary", "t7_Females" ],
columnHeaderCells: [ "t7_5km" ]
columnHeaderCells: [ "t7_5km" ],
},
{
cell: "t7_r1c3",
rowHeaderCells: [ "t7_Mary", "t7_Females" ],
columnHeaderCells: [ "t7_10km" ]
columnHeaderCells: [ "t7_10km" ],
},
{
cell: "t7_r2c1",
rowHeaderCells: [ "t7_Betsy", "t7_Females" ],
columnHeaderCells: [ "t7_1km" ]
columnHeaderCells: [ "t7_1km" ],
},
{
cell: "t7_r2c2",
rowHeaderCells: [ "t7_Betsy", "t7_Females" ],
columnHeaderCells: [ "t7_5km" ]
columnHeaderCells: [ "t7_5km" ],
},
{
cell: "t7_r2c3",
rowHeaderCells: [ "t7_Betsy", "t7_Females" ],
columnHeaderCells: [ "t7_10km" ]
columnHeaderCells: [ "t7_10km" ],
},
{
cell: "t7_r3c1",
rowHeaderCells: [ "t7_Matt", "t7_Males" ],
columnHeaderCells: [ "t7_1km" ]
columnHeaderCells: [ "t7_1km" ],
},
{
cell: "t7_r3c2",
rowHeaderCells: [ "t7_Matt", "t7_Males" ],
columnHeaderCells: [ "t7_5km" ]
columnHeaderCells: [ "t7_5km" ],
},
{
cell: "t7_r3c3",
rowHeaderCells: [ "t7_Matt", "t7_Males" ],
columnHeaderCells: [ "t7_10km" ]
columnHeaderCells: [ "t7_10km" ],
},
{
cell: "t7_r4c1",
rowHeaderCells: [ "t7_Todd", "t7_Males" ],
columnHeaderCells: [ "t7_1km" ]
columnHeaderCells: [ "t7_1km" ],
},
{
cell: "t7_r4c2",
rowHeaderCells: [ "t7_Todd", "t7_Males" ],
columnHeaderCells: [ "t7_5km" ]
columnHeaderCells: [ "t7_5km" ],
},
{
cell: "t7_r4c3",
rowHeaderCells: [ "t7_Todd", "t7_Males" ],
columnHeaderCells: [ "t7_10km" ]
}
columnHeaderCells: [ "t7_10km" ],
},
];
testHeaderCells(headerInfoMap);
@ -230,63 +230,63 @@
{
cell: "t8_r1c1",
rowHeaderCells: [ "t8_1km" ],
columnHeaderCells: [ "t8_Mary", "t8_Females" ]
columnHeaderCells: [ "t8_Mary", "t8_Females" ],
},
{
cell: "t8_r1c2",
rowHeaderCells: [ "t8_1km" ],
columnHeaderCells: [ "t8_Betsy", "t8_Females" ]
columnHeaderCells: [ "t8_Betsy", "t8_Females" ],
},
{
cell: "t8_r1c3",
rowHeaderCells: [ "t8_1km" ],
columnHeaderCells: [ "t8_Matt", "t8_Males" ]
columnHeaderCells: [ "t8_Matt", "t8_Males" ],
},
{
cell: "t8_r1c4",
rowHeaderCells: [ "t8_1km" ],
columnHeaderCells: [ "t8_Todd", "t8_Males" ]
columnHeaderCells: [ "t8_Todd", "t8_Males" ],
},
{
cell: "t8_r2c1",
rowHeaderCells: [ "t8_5km" ],
columnHeaderCells: [ "t8_Mary", "t8_Females" ]
columnHeaderCells: [ "t8_Mary", "t8_Females" ],
},
{
cell: "t8_r2c2",
rowHeaderCells: [ "t8_5km" ],
columnHeaderCells: [ "t8_Betsy", "t8_Females" ]
columnHeaderCells: [ "t8_Betsy", "t8_Females" ],
},
{
cell: "t8_r2c3",
rowHeaderCells: [ "t8_5km" ],
columnHeaderCells: [ "t8_Matt", "t8_Males" ]
columnHeaderCells: [ "t8_Matt", "t8_Males" ],
},
{
cell: "t8_r2c4",
rowHeaderCells: [ "t8_5km" ],
columnHeaderCells: [ "t8_Todd", "t8_Males" ]
columnHeaderCells: [ "t8_Todd", "t8_Males" ],
},
{
cell: "t8_r3c1",
rowHeaderCells: [ "t8_10km" ],
columnHeaderCells: [ "t8_Mary", "t8_Females" ]
columnHeaderCells: [ "t8_Mary", "t8_Females" ],
},
{
cell: "t8_r3c2",
rowHeaderCells: [ "t8_10km" ],
columnHeaderCells: [ "t8_Betsy", "t8_Females" ]
columnHeaderCells: [ "t8_Betsy", "t8_Females" ],
},
{
cell: "t8_r3c3",
rowHeaderCells: [ "t8_10km" ],
columnHeaderCells: [ "t8_Matt", "t8_Males" ]
columnHeaderCells: [ "t8_Matt", "t8_Males" ],
},
{
cell: "t8_r3c4",
rowHeaderCells: [ "t8_10km" ],
columnHeaderCells: [ "t8_Todd", "t8_Males" ]
}
columnHeaderCells: [ "t8_Todd", "t8_Males" ],
},
];
testHeaderCells(headerInfoMap);
@ -298,63 +298,63 @@
{
cell: "t9_r1c1",
rowHeaderCells: [ "t9_females", "t9_mary" ],
columnHeaderCells: [ "t9_1km" ]
columnHeaderCells: [ "t9_1km" ],
},
{
cell: "t9_r1c2",
rowHeaderCells: [ "t9_females", "t9_mary" ],
columnHeaderCells: [ "t9_5km" ]
columnHeaderCells: [ "t9_5km" ],
},
{
cell: "t9_r1c3",
rowHeaderCells: [ "t9_females", "t9_mary" ],
columnHeaderCells: [ "t9_10km" ]
columnHeaderCells: [ "t9_10km" ],
},
{
cell: "t9_r2c1",
rowHeaderCells: [ "t9_females", "t9_betsy" ],
columnHeaderCells: [ "t9_1km" ]
columnHeaderCells: [ "t9_1km" ],
},
{
cell: "t9_r2c2",
rowHeaderCells: [ "t9_females", "t9_betsy" ],
columnHeaderCells: [ "t9_5km" ]
columnHeaderCells: [ "t9_5km" ],
},
{
cell: "t9_r2c3",
rowHeaderCells: [ "t9_females", "t9_betsy" ],
columnHeaderCells: [ "t9_10km" ]
columnHeaderCells: [ "t9_10km" ],
},
{
cell: "t9_r3c1",
rowHeaderCells: [ "t9_males", "t9_matt" ],
columnHeaderCells: [ "t9_1km" ]
columnHeaderCells: [ "t9_1km" ],
},
{
cell: "t9_r3c2",
rowHeaderCells: [ "t9_males", "t9_matt" ],
columnHeaderCells: [ "t9_5km" ]
columnHeaderCells: [ "t9_5km" ],
},
{
cell: "t9_r3c3",
rowHeaderCells: [ "t9_males", "t9_matt" ],
columnHeaderCells: [ "t9_10km" ]
columnHeaderCells: [ "t9_10km" ],
},
{
cell: "t9_r4c1",
rowHeaderCells: [ "t9_males", "t9_todd" ],
columnHeaderCells: [ "t9_1km" ]
columnHeaderCells: [ "t9_1km" ],
},
{
cell: "t9_r4c2",
rowHeaderCells: [ "t9_males", "t9_todd" ],
columnHeaderCells: [ "t9_5km" ]
columnHeaderCells: [ "t9_5km" ],
},
{
cell: "t9_r4c3",
rowHeaderCells: [ "t9_males", "t9_todd" ],
columnHeaderCells: [ "t9_10km" ]
}
columnHeaderCells: [ "t9_10km" ],
},
];
testHeaderCells(headerInfoMap);
@ -366,63 +366,63 @@
{
cell: "t10_r1c1",
rowHeaderCells: [ "t10_1km" ],
columnHeaderCells: [ "t10_females", "t10_mary" ]
columnHeaderCells: [ "t10_females", "t10_mary" ],
},
{
cell: "t10_r1c2",
rowHeaderCells: [ "t10_1km" ],
columnHeaderCells: [ "t10_females", "t10_betsy" ]
columnHeaderCells: [ "t10_females", "t10_betsy" ],
},
{
cell: "t10_r1c3",
rowHeaderCells: [ "t10_1km" ],
columnHeaderCells: [ "t10_males", "t10_matt" ]
columnHeaderCells: [ "t10_males", "t10_matt" ],
},
{
cell: "t10_r1c4",
rowHeaderCells: [ "t10_1km" ],
columnHeaderCells: [ "t10_males", "t10_todd" ]
columnHeaderCells: [ "t10_males", "t10_todd" ],
},
{
cell: "t10_r2c1",
rowHeaderCells: [ "t10_5km" ],
columnHeaderCells: [ "t10_females", "t10_mary" ]
columnHeaderCells: [ "t10_females", "t10_mary" ],
},
{
cell: "t10_r2c2",
rowHeaderCells: [ "t10_5km" ],
columnHeaderCells: [ "t10_females", "t10_betsy" ]
columnHeaderCells: [ "t10_females", "t10_betsy" ],
},
{
cell: "t10_r2c3",
rowHeaderCells: [ "t10_5km" ],
columnHeaderCells: [ "t10_males", "t10_matt" ]
columnHeaderCells: [ "t10_males", "t10_matt" ],
},
{
cell: "t10_r2c4",
rowHeaderCells: [ "t10_5km" ],
columnHeaderCells: [ "t10_males", "t10_todd" ]
columnHeaderCells: [ "t10_males", "t10_todd" ],
},
{
cell: "t10_r3c1",
rowHeaderCells: [ "t10_10km" ],
columnHeaderCells: [ "t10_females", "t10_mary" ]
columnHeaderCells: [ "t10_females", "t10_mary" ],
},
{
cell: "t10_r3c2",
rowHeaderCells: [ "t10_10km" ],
columnHeaderCells: [ "t10_females", "t10_betsy" ]
columnHeaderCells: [ "t10_females", "t10_betsy" ],
},
{
cell: "t10_r3c3",
rowHeaderCells: [ "t10_10km" ],
columnHeaderCells: [ "t10_males", "t10_matt" ]
columnHeaderCells: [ "t10_males", "t10_matt" ],
},
{
cell: "t10_r3c4",
rowHeaderCells: [ "t10_10km" ],
columnHeaderCells: [ "t10_males", "t10_todd" ]
}
columnHeaderCells: [ "t10_males", "t10_todd" ],
},
];
testHeaderCells(headerInfoMap);

View File

@ -23,7 +23,7 @@
[0, 1, 2],
[3, 4, 5],
[6, 7, 8],
[9, 10, 11]
[9, 10, 11],
];
testTableIndexes("grid", idxes);
@ -31,7 +31,7 @@
[0, 1, 2],
[3, 4, 5],
[6, 7, 8],
[9, 10, 11]
[9, 10, 11],
];
testTableIndexes("grid-rowgroups", idxes);
@ -39,7 +39,7 @@
// a bit crazy ARIA grid
idxes = [
[0, 1],
[2, 3]
[2, 3],
];
testTableIndexes("grid2", idxes);

View File

@ -24,7 +24,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=410052
[0, 1, 2],
[3, 4, 5],
[6, 7, 7],
[6, 8, 9]
[6, 8, 9],
];
testTableIndexes("table", idxes);
@ -35,7 +35,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=410052
[0, 1, 2],
[3, 4, 5],
[6, 7, 7],
[6, 8, 9]
[6, 8, 9],
];
testTableIndexes("tableborder", idxes);
@ -46,7 +46,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=410052
[ 0, 1, 2, 2, 3, 4, 5, 6],
[ 7, 8, 9, 10, 11, 12, 13, 6],
[14, 15, 15, 16, 17, 18, 19, 6],
[20, 15, 15, 21, 22, 18, 23, 6]
[20, 15, 15, 21, 22, 18, 23, 6],
];
testTableIndexes("table2", idxes);
@ -57,7 +57,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=410052
[0, 1, 2],
[3, 4, 5],
[6, 7, 7],
[6, 8, 9]
[6, 8, 9],
];
testTableIndexes("tableinsane1", idxes);
@ -67,7 +67,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=410052
idxes = [
[-1, -1, -1],
[-1, -1, -1],
[ 0, 1, 2]
[ 0, 1, 2],
];
testTableIndexes("tableinsane2", idxes);
@ -76,7 +76,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=410052
// tableinsane3 (cell holes)
idxes = [
[0, 1, -1],
[2, 3, 4]
[2, 3, 4],
];
testTableIndexes("tableinsane3", idxes);
@ -86,7 +86,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=410052
idxes = [
[0, 1, 2],
[3, -1, 2],
[4, 5, 2]
[4, 5, 2],
];
testTableIndexes("tableinsane3.2", idxes);
@ -99,7 +99,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=410052
[ 3, 4, 5],
[ 6, 6, 7],
[ 8, -1, 7],
[ 9, 9, 9]
[ 9, 9, 9],
];
testTableIndexes("tableinsane4", idxes);
@ -111,7 +111,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=410052
[ 3, 4, 5, -1, -1],
[ 6, 7, -1, -1, -1],
[ 6, 8, 9, -1, -1],
[ 6, 10, 9, 11, 12]
[ 6, 10, 9, 11, 12],
];
testTableIndexes("tableinsane5", idxes);
@ -123,17 +123,25 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=410052
[ 3, 4, 5, -1, -1],
[ 6, 6, 7, -1, -1],
[ 8, 9, 7, -1, -1],
[ 10, 9, 7, 11, 12]
[ 10, 9, 7, 11, 12],
];
testTableIndexes("tableinsane6", idxes);
// ////////////////////////////////////////////////////////////////////////
// Table with a cell that has display: block; style
idxes = [
[0, 1]
[0, 1],
];
testTableIndexes("tablewithcelldisplayblock", idxes);
// ////////////////////////////////////////////////////////////////////////
// A table with a cell that has display: block; and a cell with colspan.
// This makes us fall back to the ARIAGridCellAccessible implementation.
idxes = [
[0, 0, 1],
];
testTableIndexes("tablewithcolspanandcelldisplayblock", idxes);
SimpleTest.finish();
}
@ -419,5 +427,12 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=410052
</tr>
</table>
<table id="tablewithcolspanandcelldisplayblock">
<tr>
<th colspan="2">a</th>
<td style="display: block;" >b</td>
</tr>
</table>
</body>
</html>

View File

@ -20,12 +20,12 @@
// 'Simple' table
var idxes = [
[0, 1],
[2, 3]
[2, 3],
];
testTableIndexes("simple", idxes);
var cellsArray = [
[kDataCell, kDataCell],
[kDataCell, kDataCell]
[kDataCell, kDataCell],
];
var rowsArray = [ROLE_MATHML_TABLE_ROW, ROLE_MATHML_TABLE_ROW];
testTableStruct("simple", cellsArray, kNoColumnHeader,
@ -35,7 +35,7 @@
idxes = [
[0, 0, 0],
[1, 1, 2],
[1, 1, 3]
[1, 1, 3],
];
testTableIndexes("complex", idxes);
cellsArray = [
@ -46,7 +46,7 @@
rowsArray = [
ROLE_MATHML_TABLE_ROW,
ROLE_MATHML_TABLE_ROW,
ROLE_MATHML_TABLE_ROW
ROLE_MATHML_TABLE_ROW,
];
testTableStruct("complex", cellsArray, kNoColumnHeader,
"", "", kMathTable, rowsArray);

View File

@ -30,7 +30,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=410052
[ true, false, true, true],
[ true, false, false, true],
[ true, true, true, true],
[ true, true, true, true]
[ true, true, true, true],
];
testTableSelection("table", cellsArray);
@ -44,7 +44,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=410052
cellsArray =
[
[ false, false],
[ false, false]
[ false, false],
];
testTableSelection("grid2", cellsArray);
@ -59,7 +59,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=410052
cellsArray =
[
[ undefined, true, false],
[ undefined, true, false]
[ undefined, true, false],
];
testTableSelection("grid3", cellsArray);

View File

@ -29,7 +29,7 @@
[false, false, false, kColSpanned, false, false, false, false],
[false, false, false, false, false, false, false, kRowSpanned],
[false, false, kColSpanned, false, false, false, false, kRowSpanned],
[false, kRowSpanned, kSpanned, false, false, kRowSpanned, false, kRowSpanned]
[false, kRowSpanned, kSpanned, false, false, kRowSpanned, false, kRowSpanned],
];
testTableSelection("table", cellsArray);
@ -64,7 +64,7 @@
[false, false, false, -1, -1],
[false, false, kColSpanned, kColSpanned, -1],
[kRowSpanned, false, false, -1, -1],
[kRowSpanned, false, kRowSpanned, false, false]
[kRowSpanned, false, kRowSpanned, false, false],
];
testTableSelection("tableinsane", cellsArray);

View File

@ -23,7 +23,7 @@
var cellsArray = [
[kColHeaderCell, kColHeaderCell, kColHeaderCell],
[kRowHeaderCell, kDataCell, kDataCell],
[kRowHeaderCell, kDataCell, kDataCell]
[kRowHeaderCell, kDataCell, kDataCell],
];
testTableStruct("table", cellsArray);
@ -33,7 +33,7 @@
cellsArray = [
[kColHeaderCell, kColHeaderCell, kColHeaderCell],
[kDataCell, kDataCell, kDataCell],
[kDataCell, kDataCell, kDataCell]
[kDataCell, kDataCell, kDataCell],
];
testTableStruct("grid", cellsArray);
@ -42,7 +42,7 @@
// ARIA grid with HTML table elements
cellsArray = [
[kColHeaderCell, kColHeaderCell],
[kDataCell, kDataCell]
[kDataCell, kDataCell],
];
testTableStruct("grid2", cellsArray);

View File

@ -24,7 +24,7 @@
var cellsArray = [
[kColHeaderCell, kColHeaderCell, kColHeaderCell],
[kDataCell, kDataCell, kDataCell],
[kDataCell, kDataCell, kDataCell]
[kDataCell, kDataCell, kDataCell],
];
testTableStruct("treegrid", cellsArray, kNoColumnHeader, "", "",

View File

@ -25,7 +25,7 @@
[kColHeaderCell, kColHeaderCell, kColSpanned],
[kRowSpanned, kColHeaderCell, kColHeaderCell],
[kDataCell, kDataCell, kDataCell],
[kColHeaderCell, kColHeaderCell, kColHeaderCell]
[kColHeaderCell, kColHeaderCell, kColHeaderCell],
];
testTableStruct("table1", cellsArray);
@ -36,7 +36,7 @@
var cellsArray = [
[kColHeaderCell, kColHeaderCell, kColHeaderCell],
[kRowHeaderCell, kDataCell, kDataCell],
[kRowHeaderCell, kDataCell, kDataCell]
[kRowHeaderCell, kDataCell, kDataCell],
];
testTableStruct("table2", cellsArray);
@ -47,7 +47,7 @@
cellsArray = [
[kColHeaderCell, kColHeaderCell, kColHeaderCell, kColHeaderCell],
[kRowHeaderCell, kDataCell, kDataCell, kDataCell],
[kRowHeaderCell, kDataCell, kDataCell, kDataCell]
[kRowHeaderCell, kDataCell, kDataCell, kDataCell],
];
testTableStruct("table3", cellsArray, kNoColumnHeader,
@ -61,7 +61,7 @@
[kDataCell, kDataCell, kDataCell, kColSpanned, kDataCell, kDataCell, kDataCell, kDataCell],
[kDataCell, kDataCell, kDataCell, kDataCell, kDataCell, kDataCell, kDataCell, kRowSpanned],
[kDataCell, kDataCell, kColSpanned, kDataCell, kDataCell, kDataCell, kDataCell, kRowSpanned],
[kDataCell, kRowSpanned, kSpanned, kDataCell, kDataCell, kRowSpanned, kDataCell, kRowSpanned]
[kDataCell, kRowSpanned, kSpanned, kDataCell, kDataCell, kRowSpanned, kDataCell, kRowSpanned],
];
testTableStruct("table4", cellsArray);
@ -70,7 +70,7 @@
// Table with a cell that has display: block; style
cellsArray = [
[kRowHeaderCell, kDataCell]
[kRowHeaderCell, kDataCell],
];
testTableStruct("table5", cellsArray);

View File

@ -42,7 +42,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=420863
// register 'click' event handler
gClickHandler = {
handleEvent: function handleEvent(aEvent) {
}
},
};
td3Node.addEventListener("click", gClickHandler);
@ -52,7 +52,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=420863
ID: "td2", // "onclick" attribute
actionName: "click",
actionIndex: 0,
events: CLICK_EVENTS
events: CLICK_EVENTS,
},
{
ID: td3Node,
@ -66,8 +66,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=420863
// check actions
is(getAccessible(this.ID).actionCount, 0,
"td3 shouldn't have actions");
}
}
},
},
];
testActions(actionsArray); // will call SimpleTest.finish()

View File

@ -68,13 +68,13 @@
return true;
};
Object.defineProperty(this, "offset", { get() { return this.mOffset; }
Object.defineProperty(this, "offset", { get() { return this.mOffset; },
});
Object.defineProperty(this, "offsetDescr", { get() {
return this.mOffset + " offset (" + this.mLine.number + " line, " +
(this.mOffset - this.mLine.start) + " offset on the line)";
}
},
});
Object.defineProperty(this, "tests", { get() {
@ -91,7 +91,7 @@
[ testTextAtOffset, BOUNDARY_LINE_START, cLine.start, nLine.start],
[ testTextAtOffset, BOUNDARY_LINE_END, pLine.end, cLine.end],
[ testTextAfterOffset, BOUNDARY_LINE_START, nLine.start, nnLine.start],
[ testTextAfterOffset, BOUNDARY_LINE_END, cLine.end, nLine.end]
[ testTextAfterOffset, BOUNDARY_LINE_END, cLine.end, nLine.end],
];
// Word boundary tests.
@ -137,7 +137,7 @@
nWord.start, nnWord.start ],
[ testTextAfterOffset, BOUNDARY_WORD_END,
(isAfterWordEnd ? nWord : cWord).end,
(isAfterWordEnd ? nnWord : nWord).end ]
(isAfterWordEnd ? nnWord : nWord).end ],
];
// Character boundary tests.
@ -155,11 +155,11 @@
this.mAtWrappedLineEnd ? this.offset : nextOffset ],
[ testTextAfterOffset, BOUNDARY_CHAR,
this.mAtWrappedLineEnd ? this.offset : nextOffset,
this.mAtWrappedLineEnd ? nextOffset : nextAfterNextOffset ]
this.mAtWrappedLineEnd ? nextOffset : nextAfterNextOffset ],
];
return lineTests.concat(wordTests.concat(charTests));
}
},
});
Object.defineProperty(this, "failures", { get() {
@ -168,7 +168,7 @@
if (this.mOffset == this.mLine.end)
return this.mLine.lineEndFailures;
return [];
}
},
});
this.mOffset = -1;
@ -183,11 +183,11 @@
function line(aWholeText, aLines, aIndex) {
Object.defineProperty(this, "prevLine", { get() {
return new line(aWholeText, aLines, aIndex - 1);
}
},
});
Object.defineProperty(this, "nextLine", { get() {
return new line(aWholeText, aLines, aIndex + 1);
}
},
});
Object.defineProperty(this, "start", { get() {
@ -198,7 +198,7 @@
return aWholeText.length;
return aLines[aIndex][2];
}
},
});
Object.defineProperty(this, "end", { get() {
if (aIndex < 0)
@ -208,12 +208,12 @@
return aWholeText.length;
return aLines[aIndex][3];
}
},
});
Object.defineProperty(this, "number", { get() { return aIndex; }
Object.defineProperty(this, "number", { get() { return aIndex; },
});
Object.defineProperty(this, "wholeText", { get() { return aWholeText; }
Object.defineProperty(this, "wholeText", { get() { return aWholeText; },
});
this.isFakeLine = function line_isFakeLine() {
return aIndex < 0 || aIndex >= aLines.length;
@ -227,7 +227,7 @@
var words = aLines[aIndex][4].words;
return new word(this, words, words.length - 2);
}
},
});
Object.defineProperty(this, "firstWord", { get() {
if (aIndex < 0)
@ -237,7 +237,7 @@
var words = aLines[aIndex][4].words;
return new word(this, words, 0);
}
},
});
this.isLastWord = function line_isLastWord(aWord) {
@ -250,14 +250,14 @@
return [];
return aLines[aIndex][4].lsf || [];
}
},
});
Object.defineProperty(this, "lineEndFailures", { get() {
if (aIndex < 0 || aIndex >= aLines.length)
return [];
return aLines[aIndex][4].lef || [];
}
},
});
}
@ -273,7 +273,7 @@
if (this.start == prevLineLastWord.start && !this.isFakeStartWord())
return prevLineLastWord.prevWord;
return prevLineLastWord;
}
},
});
Object.defineProperty(this, "nextWord", { get() {
if (aIndex + 2 < aWords.length)
@ -283,7 +283,7 @@
if (this.end == nextLineFirstWord.end && !this.isFakeEndWord())
return nextLineFirstWord.nextWord;
return nextLineFirstWord;
}
},
});
Object.defineProperty(this, "line", { get() { return aLine; } });
@ -295,14 +295,14 @@
if (this.isFakeEndWord())
return aLine.end;
return aWords[aIndex];
}
},
});
Object.defineProperty(this, "end", { get() {
if (this.isFakeStartWord())
return 0;
return this.isFakeEndWord() ? aLine.end : aWords[aIndex + 1];
}
},
});
this.toString = function word_toString() {
@ -378,12 +378,12 @@
traverseTextByLines(gQueue, "textarea",
[ [ "aword", "\n", 0, 5, { words: [ 0, 5 ] } ],
[ "two ", "", 6, 10, { words: [ 6, 9 ] } ],
[ "words", "", 10, 15, { words: [ 10, 15 ] } ]
[ "words", "", 10, 15, { words: [ 10, 15 ] } ],
] );
var line4 = [ // "riend "
[ "TextBeforeOffset", BOUNDARY_WORD_END, kTodo, kTodo, kTodo ],
[ "TextAfterOffset", BOUNDARY_WORD_END, kTodo, kTodo, kTodo ]
[ "TextAfterOffset", BOUNDARY_WORD_END, kTodo, kTodo, kTodo ],
];
traverseTextByLines(gQueue, "ta_wrapped",
[ [ "hi ", "", 0, 3, { words: [ 0, 2 ] } ],
@ -392,7 +392,7 @@
[ "longf", "", 12, 17, { words: [ 12, 17 ] } ],
[ "riend ", "", 17, 23, { words: [ 17, 22 ], lsf: line4 } ],
[ "t sq ", "", 23, 28, { words: [ 23, 24, 25, 27 ] } ],
[ "t", "", 28, 29, { words: [ 28, 29 ] } ]
[ "t", "", 28, 29, { words: [ 28, 29 ] } ],
] );
gQueue.invoke(); // will call SimpleTest.finish();

Some files were not shown because too many files have changed in this diff Show More