scratch – Diff between revs 58 and 125

Subversion Repositories:

?pathlinks?

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

-define( [
+define([
 	"../core",
+	"../var/rnotwhite",
+	"../var/strundefined",
 	"../core/access",
 	"./support",
-	"../var/rnothtmlwhite",
 	"../selector"
-], function( jQuery, access, support, rnothtmlwhite ) {
+], function( jQuery, rnotwhite, strundefined, access, support ) {
-"use strict";
-var boolHook,
+var nodeHook, boolHook,
 	attrHandle = jQuery.expr.attrHandle;
-jQuery.fn.extend( {
+jQuery.fn.extend({
 	attr: function( name, value ) {
 		return access( this, jQuery.attr, name, value, arguments.length > 1 );
 	},
 	removeAttr: function( name ) {
-		return this.each( function() {
+		return this.each(function() {
 			jQuery.removeAttr( this, name );
-		} );
+		});
+	}
-} );
+});
-jQuery.extend( {
+jQuery.extend({
 	attr: function( elem, name, value ) {
-		var ret, hooks,
+		var hooks, ret,
 			nType = elem.nodeType;
-		// Don't get/set attributes on text, comment and attribute nodes
+		// don't get/set attributes on text, comment and attribute nodes
-		if ( nType === 3 || nType === 8 || nType === 2 ) {
+		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
 			return;
 		}
 		// Fallback to prop when attributes are not supported
+		if ( typeof elem.getAttribute === strundefined ) {
-		if ( typeof elem.getAttribute === "undefined" ) {
+			return jQuery.prop( elem, name, value );
-			return jQuery.prop( elem, name, value );
+		}
 		// All attributes are lowercase
+		// Grab necessary hook if one is defined
-		// Attribute hooks are determined by the lowercase version
+		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
-		// Grab necessary hook if one is defined
+			name = name.toLowerCase();
-		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
-			hooks = jQuery.attrHooks[ name.toLowerCase() ] ||
-				( jQuery.expr.match.bool.test( name ) ? boolHook : undefined );
-		}
+			hooks = jQuery.attrHooks[ name ] ||
 				( jQuery.expr.match.bool.test( name ) ? boolHook : nodeHook );
-		if ( value !== undefined ) {
+		}
-			if ( value === null ) {
-				jQuery.removeAttr( elem, name );
+		if ( value !== undefined ) {
-				return;
-			}
+			if ( value === null ) {
 				jQuery.removeAttr( elem, name );
+			} else if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
+				return ret;
+			} else {
+				elem.setAttribute( name, value + "" );
+				return value;
+			}
 			if ( hooks && "set" in hooks &&
+		} else if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
+			return ret;
+		} else {
+			ret = jQuery.find.attr( elem, name );
+			// Non-existent attributes return null, we normalize to undefined
+			return ret == null ?
+				undefined :
+				ret;
+		}
-				( ret = hooks.set( elem, value, name ) ) !== undefined ) {
+	},
+	removeAttr: function( elem, value ) {
+		var name, propName,
-				return ret;
-			}
+			i = 0,
+			attrNames = value && value.match( rnotwhite );
 		if ( attrNames && elem.nodeType === 1 ) {
-			elem.setAttribute( name, value + "" );
+			while ( (name = attrNames[i++]) ) {
-			return value;
+				propName = jQuery.propFix[ name ] || name;
+					}
 					return value;
+				}
+			}
+		}
-	},
-	removeAttr: function( elem, value ) {
-		var name,
-			i = 0,
-			// Attribute names can contain non-HTML whitespace characters
-			// https://html.spec.whatwg.org/multipage/syntax.html#attributes-2
-			attrNames = value && value.match( rnothtmlwhite );
-		if ( attrNames && elem.nodeType === 1 ) {
-			while ( ( name = attrNames[ i++ ] ) ) {
-				elem.removeAttribute( name );
-			}
-		}
+	}
-} );
+});
 // Hooks for boolean attributes
 boolHook = {
 	set: function( elem, value, name ) {
-		if ( value === false ) {
 		if ( value === false ) {
 			// Remove boolean attributes when set to false
 			jQuery.removeAttr( elem, name );
 		} else {
 			elem.setAttribute( name, name );
+		}
 		return name;
+	}
-};
 };
 jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) {
 	var getter = attrHandle[ name ] || jQuery.find.attr;
-	attrHandle[ name ] = function( elem, name, isXML ) {
-		var ret, handle,
-			lowercaseName = name.toLowerCase();
+	attrHandle[ name ] = function( elem, name, isXML ) {
-		if ( !isXML ) {
+		var ret, handle;
+		if ( !isXML ) {
 			// Avoid an infinite loop by temporarily removing this function from the getter
-			handle = attrHandle[ lowercaseName ];
+			handle = attrHandle[ name ];
-			attrHandle[ lowercaseName ] = ret;
+			attrHandle[ name ] = ret;
 			ret = getter( elem, name, isXML ) != null ?
-				lowercaseName :
+				name.toLowerCase() :
 				null;
-			attrHandle[ lowercaseName ] = handle;
+			attrHandle[ name ] = handle;
+		}
 		return ret;
 	};