@@ -55,23 +55,12 @@ goog.a11y.aria.ROLE_ATTRIBUTE_ = 'role';
5555 * @private
5656 */
5757goog . a11y . aria . TAGS_WITH_ASSUMED_ROLES_ = [
58- goog . dom . TagName . A ,
59- goog . dom . TagName . AREA ,
60- goog . dom . TagName . BUTTON ,
61- goog . dom . TagName . HEAD ,
62- goog . dom . TagName . INPUT ,
63- goog . dom . TagName . LINK ,
64- goog . dom . TagName . MENU ,
65- goog . dom . TagName . META ,
66- goog . dom . TagName . OPTGROUP ,
67- goog . dom . TagName . OPTION ,
68- goog . dom . TagName . PROGRESS ,
69- goog . dom . TagName . STYLE ,
70- goog . dom . TagName . SELECT ,
71- goog . dom . TagName . SOURCE ,
72- goog . dom . TagName . TEXTAREA ,
73- goog . dom . TagName . TITLE ,
74- goog . dom . TagName . TRACK
58+ goog . dom . TagName . A , goog . dom . TagName . AREA , goog . dom . TagName . BUTTON ,
59+ goog . dom . TagName . HEAD , goog . dom . TagName . INPUT , goog . dom . TagName . LINK ,
60+ goog . dom . TagName . MENU , goog . dom . TagName . META , goog . dom . TagName . OPTGROUP ,
61+ goog . dom . TagName . OPTION , goog . dom . TagName . PROGRESS , goog . dom . TagName . STYLE ,
62+ goog . dom . TagName . SELECT , goog . dom . TagName . SOURCE , goog . dom . TagName . TEXTAREA ,
63+ goog . dom . TagName . TITLE , goog . dom . TagName . TRACK
7564] ;
7665
7766
@@ -84,20 +73,13 @@ goog.a11y.aria.TAGS_WITH_ASSUMED_ROLES_ = [
8473 * @private @const
8574 */
8675goog . a11y . aria . CONTAINER_ROLES_ = [
87- goog . a11y . aria . Role . COMBOBOX ,
88- goog . a11y . aria . Role . GRID ,
89- goog . a11y . aria . Role . GROUP ,
90- goog . a11y . aria . Role . LISTBOX ,
91- goog . a11y . aria . Role . MENU ,
92- goog . a11y . aria . Role . MENUBAR ,
93- goog . a11y . aria . Role . RADIOGROUP ,
94- goog . a11y . aria . Role . ROW ,
95- goog . a11y . aria . Role . ROWGROUP ,
96- goog . a11y . aria . Role . TAB_LIST ,
97- goog . a11y . aria . Role . TEXTBOX ,
98- goog . a11y . aria . Role . TOOLBAR ,
99- goog . a11y . aria . Role . TREE ,
100- goog . a11y . aria . Role . TREEGRID
76+ goog . a11y . aria . Role . COMBOBOX , goog . a11y . aria . Role . GRID ,
77+ goog . a11y . aria . Role . GROUP , goog . a11y . aria . Role . LISTBOX ,
78+ goog . a11y . aria . Role . MENU , goog . a11y . aria . Role . MENUBAR ,
79+ goog . a11y . aria . Role . RADIOGROUP , goog . a11y . aria . Role . ROW ,
80+ goog . a11y . aria . Role . ROWGROUP , goog . a11y . aria . Role . TAB_LIST ,
81+ goog . a11y . aria . Role . TEXTBOX , goog . a11y . aria . Role . TOOLBAR ,
82+ goog . a11y . aria . Role . TREE , goog . a11y . aria . Role . TREEGRID
10183] ;
10284
10385
@@ -119,8 +101,9 @@ goog.a11y.aria.setRole = function(element, roleName) {
119101 goog . a11y . aria . removeRole ( element ) ;
120102 } else {
121103 if ( goog . asserts . ENABLE_ASSERTS ) {
122- goog . asserts . assert ( goog . object . containsValue (
123- goog . a11y . aria . Role , roleName ) , 'No such ARIA role ' + roleName ) ;
104+ goog . asserts . assert (
105+ goog . object . containsValue ( goog . a11y . aria . Role , roleName ) ,
106+ 'No such ARIA role ' + roleName ) ;
124107 }
125108 element . setAttribute ( goog . a11y . aria . ROLE_ATTRIBUTE_ , roleName ) ;
126109 }
@@ -228,8 +211,9 @@ goog.a11y.aria.getState = function(element, stateName) {
228211 // getState(...) and setState(...) methods.
229212
230213 var attr =
231- /** @type {string|number|boolean } */ ( element . getAttribute (
232- goog . a11y . aria . getAriaAttributeName_ ( stateName ) ) ) ;
214+ /** @type {string|number|boolean } */ (
215+ element . getAttribute (
216+ goog . a11y . aria . getAriaAttributeName_ ( stateName ) ) ) ;
233217 var isNullOrUndefined = attr == null || attr == undefined ;
234218 return isNullOrUndefined ? '' : String ( attr ) ;
235219} ;
@@ -243,8 +227,8 @@ goog.a11y.aria.getState = function(element, stateName) {
243227 * @return {?Element } DOM node of the activedescendant, if found.
244228 */
245229goog . a11y . aria . getActiveDescendant = function ( element ) {
246- var id = goog . a11y . aria . getState (
247- element , goog . a11y . aria . State . ACTIVEDESCENDANT ) ;
230+ var id =
231+ goog . a11y . aria . getState ( element , goog . a11y . aria . State . ACTIVEDESCENDANT ) ;
248232 return goog . dom . getOwnerDocument ( element ) . getElementById ( id ) ;
249233} ;
250234
@@ -295,20 +279,20 @@ goog.a11y.aria.setLabel = function(element, label) {
295279 * the roles.
296280 */
297281goog . a11y . aria . assertRoleIsSetInternalUtil = function ( element , allowedRoles ) {
298- if ( goog . array . contains ( goog . a11y . aria . TAGS_WITH_ASSUMED_ROLES_ ,
299- element . tagName ) ) {
282+ if ( goog . array . contains (
283+ goog . a11y . aria . TAGS_WITH_ASSUMED_ROLES_ , element . tagName ) ) {
300284 return ;
301285 }
302286 var elementRole = /** @type {string }*/ ( goog . a11y . aria . getRole ( element ) ) ;
303- goog . asserts . assert ( elementRole != null ,
304- 'The element ARIA role cannot be null.' ) ;
287+ goog . asserts . assert (
288+ elementRole != null , 'The element ARIA role cannot be null.' ) ;
305289
306- goog . asserts . assert ( goog . array . contains ( allowedRoles , elementRole ) ,
290+ goog . asserts . assert (
291+ goog . array . contains ( allowedRoles , elementRole ) ,
307292 'Non existing or incorrect role set for element.' +
308- 'The role set is "' + elementRole +
309- '". The role should be any of "' + allowedRoles +
310- '". Check the ARIA specification for more details ' +
311- 'http://www.w3.org/TR/wai-aria/roles.' ) ;
293+ 'The role set is "' + elementRole + '". The role should be any of "' +
294+ allowedRoles + '". Check the ARIA specification for more details ' +
295+ 'http://www.w3.org/TR/wai-aria/roles.' ) ;
312296} ;
313297
314298
@@ -321,11 +305,12 @@ goog.a11y.aria.assertRoleIsSetInternalUtil = function(element, allowedRoles) {
321305 */
322306goog . a11y . aria . getStateBoolean = function ( element , stateName ) {
323307 var attr =
324- /** @type {string|boolean } */ ( element . getAttribute (
325- goog . a11y . aria . getAriaAttributeName_ ( stateName ) ) ) ;
308+ /** @type {string|boolean } */ (
309+ element . getAttribute (
310+ goog . a11y . aria . getAriaAttributeName_ ( stateName ) ) ) ;
326311 goog . asserts . assert (
327312 goog . isBoolean ( attr ) || attr == null || attr == 'true' ||
328- attr == 'false' ) ;
313+ attr == 'false' ) ;
329314 if ( attr == null ) {
330315 return attr ;
331316 }
@@ -342,10 +327,11 @@ goog.a11y.aria.getStateBoolean = function(element, stateName) {
342327 */
343328goog . a11y . aria . getStateNumber = function ( element , stateName ) {
344329 var attr =
345- /** @type {string|number } */ ( element . getAttribute (
346- goog . a11y . aria . getAriaAttributeName_ ( stateName ) ) ) ;
347- goog . asserts . assert ( ( attr == null || ! isNaN ( Number ( attr ) ) ) &&
348- ! goog . isBoolean ( attr ) ) ;
330+ /** @type {string|number } */ (
331+ element . getAttribute (
332+ goog . a11y . aria . getAriaAttributeName_ ( stateName ) ) ) ;
333+ goog . asserts . assert (
334+ ( attr == null || ! isNaN ( Number ( attr ) ) ) && ! goog . isBoolean ( attr ) ) ;
349335 return attr == null ? null : Number ( attr ) ;
350336} ;
351337
@@ -358,9 +344,10 @@ goog.a11y.aria.getStateNumber = function(element, stateName) {
358344 * the state value is empty string or not set.
359345 */
360346goog . a11y . aria . getStateString = function ( element , stateName ) {
361- var attr = element . getAttribute (
362- goog . a11y . aria . getAriaAttributeName_ ( stateName ) ) ;
363- goog . asserts . assert ( ( attr == null || goog . isString ( attr ) ) &&
347+ var attr =
348+ element . getAttribute ( goog . a11y . aria . getAriaAttributeName_ ( stateName ) ) ;
349+ goog . asserts . assert (
350+ ( attr == null || goog . isString ( attr ) ) &&
364351 ( attr == '' || isNaN ( Number ( attr ) ) ) && attr != 'true' && attr != 'false' ) ;
365352 return ( attr == null || attr == '' ) ? null : attr ;
366353} ;
@@ -376,8 +363,8 @@ goog.a11y.aria.getStateString = function(element, stateName) {
376363 * value of the state attribute.
377364 */
378365goog . a11y . aria . getStringArrayStateInternalUtil = function ( element , stateName ) {
379- var attrValue = element . getAttribute (
380- goog . a11y . aria . getAriaAttributeName_ ( stateName ) ) ;
366+ var attrValue =
367+ element . getAttribute ( goog . a11y . aria . getAriaAttributeName_ ( stateName ) ) ;
381368 return goog . a11y . aria . splitStringOnWhitespace_ ( attrValue ) ;
382369} ;
383370
@@ -430,8 +417,8 @@ goog.a11y.aria.splitStringOnWhitespace_ = function(stringValue) {
430417goog . a11y . aria . getAriaAttributeName_ = function ( ariaName ) {
431418 if ( goog . asserts . ENABLE_ASSERTS ) {
432419 goog . asserts . assert ( ariaName , 'ARIA attribute cannot be empty.' ) ;
433- goog . asserts . assert ( goog . object . containsValue (
434- goog . a11y . aria . State , ariaName ) ,
420+ goog . asserts . assert (
421+ goog . object . containsValue ( goog . a11y . aria . State , ariaName ) ,
435422 'No such ARIA attribute ' + ariaName ) ;
436423 }
437424 return goog . a11y . aria . ARIA_PREFIX_ + ariaName ;
0 commit comments