scratch – Diff between revs 58 and 125

Subversion Repositories:

?pathlinks?

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

Only display areas with differences – Ignore whitespace

-define( [
+define([
 	"../core",
-	"../core/stripAndCollapse",
+	"../var/rnotwhite",
-	"../var/rnothtmlwhite",
+	"../var/strundefined",
-	"../data/var/dataPriv",
+	"../data/var/data_priv",
 	"../core/init"
-], function( jQuery, stripAndCollapse, rnothtmlwhite, dataPriv ) {
+], function( jQuery, rnotwhite, strundefined, data_priv ) {
-"use strict";
-function getClass( elem ) {
-	return elem.getAttribute && elem.getAttribute( "class" ) || "";
-}
+var rclass = /[\t\r\n\f]/g;
-jQuery.fn.extend( {
+jQuery.fn.extend({
+	addClass: function( value ) {
-	addClass: function( value ) {
+		var classes, elem, cur, clazz, j, finalValue,
+			proceed = typeof value === "string" && value,
-		var classes, elem, cur, curValue, clazz, j, finalValue,
+			i = 0,
-			i = 0;
+			len = this.length;
 		if ( jQuery.isFunction( value ) ) {
-			return this.each( function( j ) {
+			return this.each(function( j ) {
-				jQuery( this ).addClass( value.call( this, j, getClass( this ) ) );
+				jQuery( this ).addClass( value.call( this, j, this.className ) );
+			});
-			} );
+		}
-		}
+		if ( proceed ) {
-		if ( typeof value === "string" && value ) {
+			// The disjunction here is for better compressibility (see removeClass)
-			classes = value.match( rnothtmlwhite ) || [];
+			classes = ( value || "" ).match( rnotwhite ) || [];
+			for ( ; i < len; i++ ) {
+				elem = this[ i ];
 				cur = elem.nodeType === 1 && ( elem.className ?
-			while ( ( elem = this[ i++ ] ) ) {
+					( " " + elem.className + " " ).replace( rclass, " " ) :
-				curValue = getClass( elem );
+					" "
-				cur = elem.nodeType === 1 && ( " " + stripAndCollapse( curValue ) + " " );
+				);
 				if ( cur ) {
 					j = 0;
-					while ( ( clazz = classes[ j++ ] ) ) {
+					while ( (clazz = classes[j++]) ) {
 						if ( cur.indexOf( " " + clazz + " " ) < 0 ) {
 							cur += clazz + " ";
+						}
+					}
-					// Only assign if different to avoid unneeded rendering.
+					// only assign if different to avoid unneeded rendering.
-					finalValue = stripAndCollapse( cur );
+					finalValue = jQuery.trim( cur );
-					if ( curValue !== finalValue ) {
+					if ( elem.className !== finalValue ) {
-						elem.setAttribute( "class", finalValue );
+						elem.className = finalValue;
+					}
+				}
+			}
+		}
 		return this;
 	},
 	removeClass: function( value ) {
-		var classes, elem, cur, curValue, clazz, j, finalValue,
+		var classes, elem, cur, clazz, j, finalValue,
+			proceed = arguments.length === 0 || typeof value === "string" && value,
-			i = 0;
+			i = 0,
+			len = this.length;
 		if ( jQuery.isFunction( value ) ) {
-			return this.each( function( j ) {
+			return this.each(function( j ) {
-				jQuery( this ).removeClass( value.call( this, j, getClass( this ) ) );
+				jQuery( this ).removeClass( value.call( this, j, this.className ) );
-			} );
+			});
+		}
+		if ( proceed ) {
-		}
+			classes = ( value || "" ).match( rnotwhite ) || [];
-		if ( !arguments.length ) {
-			return this.attr( "class", "" );
-		}
-		if ( typeof value === "string" && value ) {
-			classes = value.match( rnothtmlwhite ) || [];
-			while ( ( elem = this[ i++ ] ) ) {
-				curValue = getClass( elem );
+			for ( ; i < len; i++ ) {
+				elem = this[ i ];
+				// This expression is here for better compressibility (see addClass)
+				cur = elem.nodeType === 1 && ( elem.className ?
+					( " " + elem.className + " " ).replace( rclass, " " ) :
-				// This expression is here for better compressibility (see addClass)
+					""
-				cur = elem.nodeType === 1 && ( " " + stripAndCollapse( curValue ) + " " );
+				);
 				if ( cur ) {
 					j = 0;
-					while ( ( clazz = classes[ j++ ] ) ) {
+					while ( (clazz = classes[j++]) ) {
 						// Remove *all* instances
-						while ( cur.indexOf( " " + clazz + " " ) > -1 ) {
+						while ( cur.indexOf( " " + clazz + " " ) >= 0 ) {
 							cur = cur.replace( " " + clazz + " ", " " );
+						}
+					}
 					// Only assign if different to avoid unneeded rendering.
-					finalValue = stripAndCollapse( cur );
+					finalValue = value ? jQuery.trim( cur ) : "";
-					if ( curValue !== finalValue ) {
+					if ( elem.className !== finalValue ) {
-						elem.setAttribute( "class", finalValue );
+						elem.className = finalValue;
+					}
+				}
+			}
+		}
 		return this;
 	},
 	toggleClass: function( value, stateVal ) {
 		var type = typeof value;
 		if ( typeof stateVal === "boolean" && type === "string" ) {
 			return stateVal ? this.addClass( value ) : this.removeClass( value );
+		}
 		if ( jQuery.isFunction( value ) ) {
-			return this.each( function( i ) {
+			return this.each(function( i ) {
-				jQuery( this ).toggleClass(
-					value.call( this, i, getClass( this ), stateVal ),
+				jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal );
-					stateVal
-				);
-			} );
+			});
+		}
-		return this.each( function() {
-			var className, i, self, classNames;
 		return this.each(function() {
-			if ( type === "string" ) {
 			if ( type === "string" ) {
+				// Toggle individual class names
-				// Toggle individual class names
+				var className,
-				i = 0;
+					i = 0,
-				self = jQuery( this );
+					self = jQuery( this ),
-				classNames = value.match( rnothtmlwhite ) || [];
+					classNames = value.match( rnotwhite ) || [];
 				while ( ( className = classNames[ i++ ] ) ) {
 				while ( (className = classNames[ i++ ]) ) {
 					// Check each className given, space separated list
 					if ( self.hasClass( className ) ) {
 						self.removeClass( className );
 					} else {
 						self.addClass( className );
+					}
+				}
 			// Toggle whole class name
-			} else if ( value === undefined || type === "boolean" ) {
+			} else if ( type === strundefined || type === "boolean" ) {
-				className = getClass( this );
-				if ( className ) {
+				if ( this.className ) {
-					// Store className if set
+					// store className if set
-					dataPriv.set( this, "__className__", className );
+					data_priv.set( this, "__className__", this.className );
+				}
 				// If the element has a class name or if we're passed `false`,
 				// then remove the whole classname (if there was one, the above saved it).
 				// Otherwise bring back whatever was previously saved (if anything),
 				// falling back to the empty string if nothing was stored.
-				if ( this.setAttribute ) {
-					this.setAttribute( "class",
-						className || value === false ?
-						"" :
-						dataPriv.get( this, "__className__" ) || ""
+				this.className = this.className || value === false ? "" : data_priv.get( this, "__className__" ) || "";
-					);
-				}
+			}
-		} );
+		});
 	},
 	hasClass: function( selector ) {
-		var className, elem,
+		var className = " " + selector + " ",
-			i = 0;
+			i = 0,
-		className = " " + selector + " ";
+			l = this.length;
-		while ( ( elem = this[ i++ ] ) ) {
+		for ( ; i < l; i++ ) {
-			if ( elem.nodeType === 1 &&
-				( " " + stripAndCollapse( getClass( elem ) ) + " " ).indexOf( className ) > -1 ) {
+			if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) {
-					return true;
+				return true;
+			}
+		}
 		return false;
+	}
-} );
+});
-} );
+});