diff options
| -rw-r--r-- | src/css.js | 8 | ||||
| -rw-r--r-- | src/css/var/swap.js (renamed from src/css/swap.js) | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/src/css.js b/src/css.js index 497b0ec53..286eef64b 100644 --- a/src/css.js +++ b/src/css.js @@ -8,6 +8,7 @@ define([ "./css/var/cssExpand", "./css/var/isHidden", "./css/var/getStyles", + "./css/var/swap", "./css/curCSS", "./css/adjustCSS", "./css/defaultDisplay", @@ -16,11 +17,10 @@ define([ "./data/var/dataPriv", "./core/init", - "./css/swap", "./core/ready", "./selector" // contains ], function( jQuery, pnum, access, rmargin, rcssNum, rnumnonpx, cssExpand, isHidden, - getStyles, curCSS, adjustCSS, defaultDisplay, addGetHookIf, support, dataPriv ) { + getStyles, swap, curCSS, adjustCSS, defaultDisplay, addGetHookIf, support, dataPriv ) { var // Swappable if display is none or starts with table @@ -359,7 +359,7 @@ jQuery.each([ "height", "width" ], function( i, name ) { // but it must have a current display style that would benefit 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 ); @@ -385,7 +385,7 @@ jQuery.each([ "height", "width" ], function( i, name ) { 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 b/src/css/var/swap.js index ce1643531..61351f14b 100644 --- a/src/css/swap.js +++ b/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; - }); |