Data: Refactor to reduce size

gibson042 · web-flow · commit 805cdb43fd02 · 2024-01-22T22:13:23.000-05:00
* Return the new value from `set(owner, key, value)`. * Use `set(owner, key, value)` rather than `access(owner, key, value)`. Close gh-5392
diff --git a/src/data/Data.js b/src/data/Data.js
@@ -61,7 +61,7 @@ Data.prototype = {
 				cache[ camelCase( prop ) ] = data[ prop ];
 			}
 		}
-		return cache;
+		return value;
 	},
 	get: function( owner, key ) {
 		return key === undefined ?
diff --git a/src/effects.js b/src/effects.js
@@ -206,7 +206,7 @@ function defaultPrefilter( elem, props, opts ) {
 					hidden = dataShow.hidden;
 				}
 			} else {
-				dataShow = dataPriv.access( elem, "fxshow", { display: restoreDisplay } );
+				dataShow = dataPriv.set( elem, "fxshow", { display: restoreDisplay } );
 			}
 
 			// Store hidden/visible for toggle so `.stop().toggle()` "reverses"
diff --git a/src/manipulation.js b/src/manipulation.js
@@ -35,34 +35,26 @@ function manipulationTarget( elem, content ) {
 }
 
 function cloneCopyEvent( src, dest ) {
-	var i, l, type, pdataOld, udataOld, udataCur, events;
+	var type, i, l,
+		events = dataPriv.get( src, "events" );
 
 	if ( dest.nodeType !== 1 ) {
 		return;
 	}
 
 	// 1. Copy private data: events, handlers, etc.
-	if ( dataPriv.hasData( src ) ) {
-		pdataOld = dataPriv.get( src );
-		events = pdataOld.events;
-
-		if ( events ) {
-			dataPriv.remove( dest, "handle events" );
-
-			for ( type in events ) {
-				for ( i = 0, l = events[ type ].length; i < l; i++ ) {
-					jQuery.event.add( dest, type, events[ type ][ i ] );
-				}
+	if ( events ) {
+		dataPriv.remove( dest, "handle events" );
+		for ( type in events ) {
+			for ( i = 0, l = events[ type ].length; i < l; i++ ) {
+				jQuery.event.add( dest, type, events[ type ][ i ] );
 			}
 		}
 	}
 
 	// 2. Copy user data
 	if ( dataUser.hasData( src ) ) {
-		udataOld = dataUser.access( src );
-		udataCur = jQuery.extend( {}, udataOld );
-
-		dataUser.set( dest, udataCur );
+		dataUser.set( dest, jQuery.extend( {}, dataUser.get( src ) ) );
 	}
 }
 
diff --git a/src/manipulation/domManip.js b/src/manipulation/domManip.js
@@ -82,7 +82,7 @@ export function domManip( collection, args, callback, ignored ) {
 				for ( i = 0; i < hasScripts; i++ ) {
 					node = scripts[ i ];
 					if ( rscriptType.test( node.type || "" ) &&
-						!dataPriv.access( node, "globalEval" ) &&
+						!dataPriv.get( node, "globalEval" ) &&
 						jQuery.contains( doc, node ) ) {
 
 						if ( node.src && ( node.type || "" ).toLowerCase()  !== "module" ) {
diff --git a/src/queue.js b/src/queue.js
@@ -15,7 +15,7 @@ jQuery.extend( {
 			// Speed up dequeue by getting out quickly if this is just a lookup
 			if ( data ) {
 				if ( !queue || Array.isArray( data ) ) {
-					queue = dataPriv.access( elem, type, jQuery.makeArray( data ) );
+					queue = dataPriv.set( elem, type, jQuery.makeArray( data ) );
 				} else {
 					queue.push( data );
 				}
@@ -62,7 +62,7 @@ jQuery.extend( {
 	// Not public - generate a queueHooks object, or return the current one
 	_queueHooks: function( elem, type ) {
 		var key = type + "queueHooks";
-		return dataPriv.get( elem, key ) || dataPriv.access( elem, key, {
+		return dataPriv.get( elem, key ) || dataPriv.set( elem, key, {
 			empty: jQuery.Callbacks( "once memory" ).add( function() {
 				dataPriv.remove( elem, [ type + "queue", key ] );
 			} )

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ Data.prototype = {`
`61`	`61`	`cache[ camelCase( prop ) ] = data[ prop ];`
`62`	`62`	`}`
`63`	`63`	`}`
`64`		`- return cache;`
	`64`	`+ return value;`
`65`	`65`	`},`
`66`	`66`	`get: function( owner, key ) {`
`67`	`67`	`return key === undefined ?`
Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ function defaultPrefilter( elem, props, opts ) {`
`206`	`206`	`hidden = dataShow.hidden;`
`207`	`207`	`}`
`208`	`208`	`} else {`
`209`		`- dataShow = dataPriv.access( elem, "fxshow", { display: restoreDisplay } );`
	`209`	`+ dataShow = dataPriv.set( elem, "fxshow", { display: restoreDisplay } );`
`210`	`210`	`}`
`211`	`211`
`212`	`212`	// Store hidden/visible for toggle so `.stop().toggle()` "reverses"
Original file line number	Diff line number	Diff line change
`@@ -35,34 +35,26 @@ function manipulationTarget( elem, content ) {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`function cloneCopyEvent( src, dest ) {`
`38`		`- var i, l, type, pdataOld, udataOld, udataCur, events;`
	`38`	`+ var type, i, l,`
	`39`	`+ events = dataPriv.get( src, "events" );`
`39`	`40`
`40`	`41`	`if ( dest.nodeType !== 1 ) {`
`41`	`42`	`return;`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`// 1. Copy private data: events, handlers, etc.`
`45`		`- if ( dataPriv.hasData( src ) ) {`
`46`		`- pdataOld = dataPriv.get( src );`
`47`		`- events = pdataOld.events;`
`48`		`-`
`49`		`- if ( events ) {`
`50`		`- dataPriv.remove( dest, "handle events" );`
`51`		`-`
`52`		`- for ( type in events ) {`
`53`		`- for ( i = 0, l = events[ type ].length; i < l; i++ ) {`
`54`		`- jQuery.event.add( dest, type, events[ type ][ i ] );`
`55`		`- }`
	`46`	`+ if ( events ) {`
	`47`	`+ dataPriv.remove( dest, "handle events" );`
	`48`	`+ for ( type in events ) {`
	`49`	`+ for ( i = 0, l = events[ type ].length; i < l; i++ ) {`
	`50`	`+ jQuery.event.add( dest, type, events[ type ][ i ] );`
`56`	`51`	`}`
`57`	`52`	`}`
`58`	`53`	`}`
`59`	`54`
`60`	`55`	`// 2. Copy user data`
`61`	`56`	`if ( dataUser.hasData( src ) ) {`
`62`		`- udataOld = dataUser.access( src );`
`63`		`- udataCur = jQuery.extend( {}, udataOld );`
`64`		`-`
`65`		`- dataUser.set( dest, udataCur );`
	`57`	`+ dataUser.set( dest, jQuery.extend( {}, dataUser.get( src ) ) );`
`66`	`58`	`}`
`67`	`59`	`}`
`68`	`60`