github/jquery
1
1
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2026-02-01 00:08:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

CSS: Don't expose jQuery.swap

Browse Source 
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
This commit is contained in:
Michał Gołębiowski
2015-03-30 19:19:15 +02:00
committed by Timmy Willison
parent 3a0dd5a3d3
commit bb4d888f4f
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/css.js
View File

@@ -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" ] );
}
}

8
src/css/swap.js → src/css/var/swap.js
View File

@@ -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;
});