aboutsummaryrefslogtreecommitdiffstats
path: root/src/attributes/val.js
diff options
context:
space:
mode:
authorTimmy Willison <timmywillisn@gmail.com>2014-07-17 10:25:59 -0700
committerTimmy Willison <timmywillisn@gmail.com>2014-07-17 11:08:37 -0700
commit91e06e9aebecf67a5c4997408bf0a28fffd03f9d (patch)
tree2542fcea18d695dec17642b89ff0beb9dcc3f330 /src/attributes/val.js
parent511eb1540bba2fbd45b6399c60ca361f11e572df (diff)
downloadjquery-91e06e9aebecf67a5c4997408bf0a28fffd03f9d.tar.gz
jquery-91e06e9aebecf67a5c4997408bf0a28fffd03f9d.zip
Build: update grunt-jscs-checker and pass with the new rules
Conflicts: build/tasks/build.js src/ajax/xhr.js src/attributes/classes.js src/attributes/prop.js src/attributes/val.js src/core/init.js src/core/ready.js src/css.js src/css/curCSS.js src/css/defaultDisplay.js src/data.js src/data/var/dataPriv.js src/data/var/dataUser.js src/dimensions.js src/effects.js src/event.js src/manipulation.js src/offset.js src/queue.js src/selector-native.js test/data/testrunner.js
Diffstat (limited to 'src/attributes/val.js')
-rw-r--r--src/attributes/val.js10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/attributes/val.js b/src/attributes/val.js
index 4a3b0e5c1..c51a1a3b8 100644
--- a/src/attributes/val.js
+++ b/src/attributes/val.js
@@ -13,7 +13,8 @@ jQuery.fn.extend({
if ( !arguments.length ) {
if ( elem ) {
- hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ];
+ hooks = jQuery.valHooks[ elem.type ] ||
+ jQuery.valHooks[ elem.nodeName.toLowerCase() ];
if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
return ret;
@@ -98,8 +99,11 @@ jQuery.extend({
// oldIE doesn't update selected after form reset (#2551)
if ( ( option.selected || i === index ) &&
// Don't return options that are disabled or in a disabled optgroup
- ( support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null ) &&
- ( !option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
+ ( support.optDisabled ?
+ !option.disabled :
+ option.getAttribute("disabled") === null ) &&
+ ( !option.parentNode.disabled ||
+ !jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
// Get the specific value for the option
value = jQuery( option ).val();