CSS: Don't expose jQuery.swap

jQuery.swap was an undocumented API used only internally. With the modular AMD system we currently have it's not necessary to expose this function publicly under the jQuery object. Fixes gh-2058 Closes gh-2182
jquery · Apr 13, 2015 · 02a9d9f · 02a9d9f
1 parent 345c95a
commit 02a9d9f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/src/css.js b/src/css.js
@@ -7,18 +7,18 @@ define([
 	"./css/var/rnumnonpx",
 	"./css/var/cssExpand",
 	"./css/var/isHidden",
+	"./css/var/swap",
 	"./css/curCSS",
 	"./css/adjustCSS",
 	"./css/defaultDisplay",
 	"./css/addGetHookIf",
 	"./css/support",
 
 	"./core/init",
-	"./css/swap",
 	"./core/ready",
 	"./selector" // contains
 ], function( jQuery, pnum, access, rmargin, rcssNum, rnumnonpx, cssExpand, isHidden,
-	curCSS, adjustCSS, defaultDisplay, addGetHookIf, support ) {
+	curCSS, swap, adjustCSS, defaultDisplay, addGetHookIf, support ) {
 
 var
 	// BuildExclude
@@ -366,7 +366,7 @@ jQuery.each([ "height", "width" ], function( i, name ) {
 				// however, it must have a current display style that would benefit from this
 				return rdisplayswap.test( jQuery.css( elem, "display" ) ) &&
 					elem.offsetWidth === 0 ?
-						jQuery.swap( elem, cssShow, function() {
+						swap( elem, cssShow, function() {
 							return getWidthOrHeight( elem, name, extra );
 						}) :
 						getWidthOrHeight( elem, name, extra );
@@ -440,7 +440,7 @@ if ( !support.opacity ) {
 jQuery.cssHooks.marginRight = addGetHookIf( support.reliableMarginRight,
 	function( elem, computed ) {
 		if ( computed ) {
-			return jQuery.swap( elem, { "display": "inline-block" },
+			return swap( elem, { "display": "inline-block" },
 				curCSS, [ elem, "marginRight" ] );
 		}
 	}

diff --git a/src/css/swap.js → src/css/var/swap.js b/src/css/swap.js → src/css/var/swap.js
@@ -1,9 +1,7 @@
-define([
-	"../core"
-], function( jQuery ) {
+define(function() {
 
 // A method for quickly swapping in/out CSS properties to get correct calculations.
-jQuery.swap = function( elem, options, callback, args ) {
+return function swap( elem, options, callback, args ) {
 	var ret, name,
 		old = {};
 
@@ -23,6 +21,4 @@ jQuery.swap = function( elem, options, callback, args ) {
 	return ret;
 };
 
-return jQuery.swap;
-
 });