scratch – Diff between revs 58 and 125

Subversion Repositories:

?pathlinks?

Rev 58 – Details – Blame – Last modification – View Log

-define( [
+define([
 	"../core",
-	"../core/stripAndCollapse",
 	"./support",
 	"../core/init"
-], function( jQuery, stripAndCollapse, support ) {
+], function( jQuery, support ) {
-"use strict";
 var rreturn = /\r/g;
-jQuery.fn.extend( {
+jQuery.fn.extend({
 	val: function( value ) {
 		var hooks, ret, isFunction,
-			elem = this[ 0 ];
+			elem = this[0];
-		if ( !arguments.length ) {
-			if ( elem ) {
-				hooks = jQuery.valHooks[ elem.type ] ||
-					jQuery.valHooks[ elem.nodeName.toLowerCase() ];
+		if ( !arguments.length ) {
-				if ( hooks &&
+			if ( elem ) {
-					"get" in hooks &&
+				hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ];
 					( ret = hooks.get( elem, "value" ) ) !== undefined
-				) {
+				if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
 					return ret;
 				}
-				ret = elem.value;
-				// Handle most common string cases
+				ret = elem.value;
 				if ( typeof ret === "string" ) {
-					return ret.replace( rreturn, "" );
+				return typeof ret === "string" ?
 					// Handle most common string cases
 					ret.replace(rreturn, "") :
-				// Handle cases where value is null/undef or number
+					// Handle cases where value is null/undef or number
-				return ret == null ? "" : ret;
+					ret == null ? "" : ret;
+			}
 			return;
 				val += "";
 			} else if ( jQuery.isArray( val ) ) {
 				val = jQuery.map( val, function( value ) {
 					return value == null ? "" : value + "";
-				} );
+				});
+			}
 			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
 			// If set returns undefined, fall back to normal setting
-			if ( !hooks || !( "set" in hooks ) || hooks.set( this, val, "value" ) === undefined ) {
+			if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
 				this.value = val;
 			}
-		} );
+		});
+	}
-} );
+});
-jQuery.extend( {
-	valHooks: {
+jQuery.extend({
-		option: {
+	valHooks: {
-			get: function( elem ) {
+		option: {
-				var val = jQuery.find.attr( elem, "value" );
+			get: function( elem ) {
-				return val != null ?
+				var val = jQuery.find.attr( elem, "value" );
-					val :
-					// Support: IE <=10 - 11 only
+				return val != null ?
-					// option.text throws exceptions (#14686, #14858)
+					val :
-					// Strip and collapse whitespace
+					// Support: IE10-11+
-					// https://html.spec.whatwg.org/#strip-and-collapse-whitespace
+					// option.text throws exceptions (#14686, #14858)
-					stripAndCollapse( jQuery.text( elem ) );
+					jQuery.trim( jQuery.text( elem ) );
 			}
 		},
 		select: {
 			get: function( elem ) {
-				var value, option, i,
+				var value, option,
 					options = elem.options,
-					index = elem.selectedIndex,
-					one = elem.type === "select-one",
+					index = elem.selectedIndex,
-					values = one ? null : [],
+					one = elem.type === "select-one" || index < 0,
-					max = one ? index + 1 : options.length;
-				if ( index < 0 ) {
+					values = one ? null : [],
-					i = max;
 					max = one ? index + 1 : options.length,
-				} else {
+					i = index < 0 ?
-					i = one ? index : 0;
+						max :
-				}
+						one ? index : 0;
 				// Loop through all the selected options
-				for ( ; i < max; i++ ) {
-					option = options[ i ];
+				// Loop through all the selected options
-					// Support: IE <=9 only
+				for ( ; i < max; i++ ) {
-					// IE8-9 doesn't update selected after form reset (#2551)
+					option = options[ i ];
 					if ( ( option.selected || i === index ) &&
 					// IE6-9 doesn't update selected after form reset (#2551)
-							// Don't return options that are disabled or in a disabled optgroup
+					if ( ( option.selected || i === index ) &&
 					values = jQuery.makeArray( value ),
 					i = options.length;
 				while ( i-- ) {
-					option = options[ i ];
-					/* eslint-disable no-cond-assign */
-					if ( option.selected =
+					option = options[ i ];
-						jQuery.inArray( jQuery.valHooks.option.get( option ), values ) > -1
-					) {
+					if ( (option.selected = jQuery.inArray( option.value, values ) >= 0) ) {
 						optionSet = true;
-					}
 					/* eslint-enable no-cond-assign */
+				}
 				// Force browsers to behave consistently when non-matching value is set
 				if ( !optionSet ) {
 					elem.selectedIndex = -1;
+				}
 				return values;
+			}
 		}
+	}
-} );
+});
 // Radios and checkboxes getter/setter
-jQuery.each( [ "radio", "checkbox" ], function() {
+jQuery.each([ "radio", "checkbox" ], function() {
 	jQuery.valHooks[ this ] = {
 		set: function( elem, value ) {
 			if ( jQuery.isArray( value ) ) {
-				return ( elem.checked = jQuery.inArray( jQuery( elem ).val(), value ) > -1 );
+				return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 );
+			}
+		}
 	};
 	if ( !support.checkOn ) {
 		jQuery.valHooks[ this ].get = function( elem ) {
-			return elem.getAttribute( "value" ) === null ? "on" : elem.value;
+			return elem.getAttribute("value") === null ? "on" : elem.value;
 		};