diff options
author | Oleg Gaidarenko <markelog@gmail.com> | 2013-04-08 21:33:17 -0400 |
---|---|---|
committer | Timmy Willison <timmywillisn@gmail.com> | 2013-04-08 21:41:08 -0400 |
commit | 08e57b1de728510de008acb25f7d75f0a20b78bc (patch) | |
tree | 8721d2df46dbadb8a8a828d829cceccaa6eb8e26 /src | |
parent | 90eb24e58ddbd0b2f1e052b5b47796691a1de86d (diff) | |
download | jquery-08e57b1de728510de008acb25f7d75f0a20b78bc.tar.gz jquery-08e57b1de728510de008acb25f7d75f0a20b78bc.zip |
Adjust the return value of the tabIndex propHook to match the spec. Fixes #13752.
Diffstat (limited to 'src')
-rw-r--r-- | src/attributes.js | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/attributes.js b/src/attributes.js index 0b9b06b31..549e95eb0 100644 --- a/src/attributes.js +++ b/src/attributes.js @@ -414,20 +414,14 @@ jQuery.extend({ } if ( value !== undefined ) { - if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) { - return ret; - - } else { - return ( elem[ name ] = value ); - } + return hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ? + ret : + ( elem[ name ] = value ); } else { - if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) { - return ret; - - } else { - return elem[ name ]; - } + return hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ? + ret : + elem[ name ]; } }, @@ -442,7 +436,7 @@ jQuery.extend({ parseInt( attributeNode.value, 10 ) : rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ? 0 : - undefined; + -1; } } } |