mirror of
https://github.com/jquery/jquery.git
synced 2024-11-23 02:54:22 +00:00
Reorder css.js logically
Conflicts: src/css.js
This commit is contained in:
Timmy Willison
parent
ee0343dd1b
commit
800b80f2ef
436
src/css.js
436
src/css.js
@ -31,6 +31,100 @@ var getStyles, curCSS,
|
|||||||
|
|
||||||
cssPrefixes = [ "Webkit", "O", "Moz", "ms" ];
|
cssPrefixes = [ "Webkit", "O", "Moz", "ms" ];
|
||||||
|
|
||||||
|
// NOTE: we've included the "window" in window.getComputedStyle
|
||||||
|
// because jsdom on node.js will break without it.
|
||||||
|
if ( window.getComputedStyle ) {
|
||||||
|
getStyles = function( elem ) {
|
||||||
|
return elem.ownerDocument.defaultView.getComputedStyle( elem, null );
|
||||||
|
};
|
||||||
|
|
||||||
|
curCSS = function( elem, name, _computed ) {
|
||||||
|
var width, minWidth, maxWidth,
|
||||||
|
computed = _computed || getStyles( elem ),
|
||||||
|
|
||||||
|
// getPropertyValue is only needed for .css('filter') in IE9, see #12537
|
||||||
|
ret = computed ? computed.getPropertyValue( name ) || computed[ name ] : undefined,
|
||||||
|
style = elem.style;
|
||||||
|
|
||||||
|
if ( computed ) {
|
||||||
|
|
||||||
|
if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
|
||||||
|
ret = jQuery.style( elem, name );
|
||||||
|
}
|
||||||
|
|
||||||
|
// A tribute to the "awesome hack by Dean Edwards"
|
||||||
|
// Chrome < 17 and Safari 5.0 uses "computed value" instead of "used value" for margin-right
|
||||||
|
// Safari 5.1.7 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels
|
||||||
|
// this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
|
||||||
|
if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) {
|
||||||
|
|
||||||
|
// Remember the original values
|
||||||
|
width = style.width;
|
||||||
|
minWidth = style.minWidth;
|
||||||
|
maxWidth = style.maxWidth;
|
||||||
|
|
||||||
|
// Put in the new values to get a computed value out
|
||||||
|
style.minWidth = style.maxWidth = style.width = ret;
|
||||||
|
ret = computed.width;
|
||||||
|
|
||||||
|
// Revert the changed values
|
||||||
|
style.width = width;
|
||||||
|
style.minWidth = minWidth;
|
||||||
|
style.maxWidth = maxWidth;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
};
|
||||||
|
} else if ( document.documentElement.currentStyle ) {
|
||||||
|
getStyles = function( elem ) {
|
||||||
|
return elem.currentStyle;
|
||||||
|
};
|
||||||
|
|
||||||
|
curCSS = function( elem, name, _computed ) {
|
||||||
|
var left, rs, rsLeft,
|
||||||
|
computed = _computed || getStyles( elem ),
|
||||||
|
ret = computed ? computed[ name ] : undefined,
|
||||||
|
style = elem.style;
|
||||||
|
|
||||||
|
// Avoid setting ret to empty string here
|
||||||
|
// so we don't default to auto
|
||||||
|
if ( ret == null && style && style[ name ] ) {
|
||||||
|
ret = style[ name ];
|
||||||
|
}
|
||||||
|
|
||||||
|
// From the awesome hack by Dean Edwards
|
||||||
|
// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
|
||||||
|
|
||||||
|
// If we're not dealing with a regular pixel number
|
||||||
|
// but a number that has a weird ending, we need to convert it to pixels
|
||||||
|
// but not position css attributes, as those are proportional to the parent element instead
|
||||||
|
// and we can't measure the parent instead because it might trigger a "stacking dolls" problem
|
||||||
|
if ( rnumnonpx.test( ret ) && !rposition.test( name ) ) {
|
||||||
|
|
||||||
|
// Remember the original values
|
||||||
|
left = style.left;
|
||||||
|
rs = elem.runtimeStyle;
|
||||||
|
rsLeft = rs && rs.left;
|
||||||
|
|
||||||
|
// Put in the new values to get a computed value out
|
||||||
|
if ( rsLeft ) {
|
||||||
|
rs.left = elem.currentStyle.left;
|
||||||
|
}
|
||||||
|
style.left = name === "fontSize" ? "1em" : ret;
|
||||||
|
ret = style.pixelLeft + "px";
|
||||||
|
|
||||||
|
// Revert the changed values
|
||||||
|
style.left = left;
|
||||||
|
if ( rsLeft ) {
|
||||||
|
rs.left = rsLeft;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret === "" ? "auto" : ret;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
// return a css property mapped to a potentially vendor prefixed property
|
// return a css property mapped to a potentially vendor prefixed property
|
||||||
function vendorPropName( style, name ) {
|
function vendorPropName( style, name ) {
|
||||||
|
|
||||||
@ -108,49 +202,95 @@ function showHide( elements, show ) {
|
|||||||
return elements;
|
return elements;
|
||||||
}
|
}
|
||||||
|
|
||||||
jQuery.fn.extend({
|
function setPositiveNumber( elem, value, subtract ) {
|
||||||
css: function( name, value ) {
|
var matches = rnumsplit.exec( value );
|
||||||
return jQuery.access( this, function( elem, name, value ) {
|
return matches ?
|
||||||
var len, styles,
|
// Guard against undefined "subtract", e.g., when used as in cssHooks
|
||||||
map = {},
|
Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) :
|
||||||
i = 0;
|
value;
|
||||||
|
|
||||||
if ( jQuery.isArray( name ) ) {
|
|
||||||
styles = getStyles( elem );
|
|
||||||
len = name.length;
|
|
||||||
|
|
||||||
for ( ; i < len; i++ ) {
|
|
||||||
map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return map;
|
function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) {
|
||||||
|
var i = extra === ( isBorderBox ? "border" : "content" ) ?
|
||||||
|
// If we already have the right measurement, avoid augmentation
|
||||||
|
4 :
|
||||||
|
// Otherwise initialize for horizontal or vertical properties
|
||||||
|
name === "width" ? 1 : 0,
|
||||||
|
|
||||||
|
val = 0;
|
||||||
|
|
||||||
|
for ( ; i < 4; i += 2 ) {
|
||||||
|
// both box models exclude margin, so add it if we want it
|
||||||
|
if ( extra === "margin" ) {
|
||||||
|
val += jQuery.css( elem, extra + cssExpand[ i ], true, styles );
|
||||||
}
|
}
|
||||||
|
|
||||||
return value !== undefined ?
|
if ( isBorderBox ) {
|
||||||
jQuery.style( elem, name, value ) :
|
// border-box includes padding, so remove it if we want content
|
||||||
jQuery.css( elem, name );
|
if ( extra === "content" ) {
|
||||||
}, name, value, arguments.length > 1 );
|
val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
|
||||||
},
|
|
||||||
show: function() {
|
|
||||||
return showHide( this, true );
|
|
||||||
},
|
|
||||||
hide: function() {
|
|
||||||
return showHide( this );
|
|
||||||
},
|
|
||||||
toggle: function( state ) {
|
|
||||||
if ( typeof state === "boolean" ) {
|
|
||||||
return state ? this.show() : this.hide();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return this.each(function() {
|
// at this point, extra isn't border nor margin, so remove border
|
||||||
if ( isHidden( this ) ) {
|
if ( extra !== "margin" ) {
|
||||||
jQuery( this ).show();
|
val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
jQuery( this ).hide();
|
// at this point, extra isn't content, so add padding
|
||||||
|
val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
|
||||||
|
|
||||||
|
// at this point, extra isn't content nor padding, so add border
|
||||||
|
if ( extra !== "padding" ) {
|
||||||
|
val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
|
||||||
}
|
}
|
||||||
});
|
|
||||||
}
|
}
|
||||||
});
|
}
|
||||||
|
|
||||||
|
return val;
|
||||||
|
}
|
||||||
|
|
||||||
|
function getWidthOrHeight( elem, name, extra ) {
|
||||||
|
|
||||||
|
// Start with offset property, which is equivalent to the border-box value
|
||||||
|
var valueIsBorderBox = true,
|
||||||
|
val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
|
||||||
|
styles = getStyles( elem ),
|
||||||
|
isBorderBox = support.boxSizing() && jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
|
||||||
|
|
||||||
|
// some non-html elements return undefined for offsetWidth, so check for null/undefined
|
||||||
|
// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
|
||||||
|
// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
|
||||||
|
if ( val <= 0 || val == null ) {
|
||||||
|
// Fall back to computed then uncomputed css if necessary
|
||||||
|
val = curCSS( elem, name, styles );
|
||||||
|
if ( val < 0 || val == null ) {
|
||||||
|
val = elem.style[ name ];
|
||||||
|
}
|
||||||
|
|
||||||
|
// Computed unit is not pixels. Stop here and return.
|
||||||
|
if ( rnumnonpx.test(val) ) {
|
||||||
|
return val;
|
||||||
|
}
|
||||||
|
|
||||||
|
// we need the check for style in case a browser which returns unreliable values
|
||||||
|
// for getComputedStyle silently falls back to the reliable elem.style
|
||||||
|
valueIsBorderBox = isBorderBox && ( support.boxSizingReliable() || val === elem.style[ name ] );
|
||||||
|
|
||||||
|
// Normalize "", auto, and prepare for extra
|
||||||
|
val = parseFloat( val ) || 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// use the active box-sizing model to add/subtract irrelevant styles
|
||||||
|
return ( val +
|
||||||
|
augmentWidthOrHeight(
|
||||||
|
elem,
|
||||||
|
name,
|
||||||
|
extra || ( isBorderBox ? "border" : "content" ),
|
||||||
|
valueIsBorderBox,
|
||||||
|
styles
|
||||||
|
)
|
||||||
|
) + "px";
|
||||||
|
}
|
||||||
|
|
||||||
jQuery.extend({
|
jQuery.extend({
|
||||||
// Add in style property hooks for overriding the default
|
// Add in style property hooks for overriding the default
|
||||||
@ -289,190 +429,6 @@ jQuery.extend({
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// NOTE: we've included the "window" in window.getComputedStyle
|
|
||||||
// because jsdom on node.js will break without it.
|
|
||||||
if ( window.getComputedStyle ) {
|
|
||||||
getStyles = function( elem ) {
|
|
||||||
return elem.ownerDocument.defaultView.getComputedStyle( elem, null );
|
|
||||||
};
|
|
||||||
|
|
||||||
curCSS = function( elem, name, _computed ) {
|
|
||||||
var width, minWidth, maxWidth,
|
|
||||||
computed = _computed || getStyles( elem ),
|
|
||||||
|
|
||||||
// getPropertyValue is only needed for .css('filter') in IE9, see #12537
|
|
||||||
ret = computed ? computed.getPropertyValue( name ) || computed[ name ] : undefined,
|
|
||||||
style = elem.style;
|
|
||||||
|
|
||||||
if ( computed ) {
|
|
||||||
|
|
||||||
if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
|
|
||||||
ret = jQuery.style( elem, name );
|
|
||||||
}
|
|
||||||
|
|
||||||
// A tribute to the "awesome hack by Dean Edwards"
|
|
||||||
// Chrome < 17 and Safari 5.0 uses "computed value" instead of "used value" for margin-right
|
|
||||||
// Safari 5.1.7 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels
|
|
||||||
// this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
|
|
||||||
if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) {
|
|
||||||
|
|
||||||
// Remember the original values
|
|
||||||
width = style.width;
|
|
||||||
minWidth = style.minWidth;
|
|
||||||
maxWidth = style.maxWidth;
|
|
||||||
|
|
||||||
// Put in the new values to get a computed value out
|
|
||||||
style.minWidth = style.maxWidth = style.width = ret;
|
|
||||||
ret = computed.width;
|
|
||||||
|
|
||||||
// Revert the changed values
|
|
||||||
style.width = width;
|
|
||||||
style.minWidth = minWidth;
|
|
||||||
style.maxWidth = maxWidth;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
};
|
|
||||||
} else if ( document.documentElement.currentStyle ) {
|
|
||||||
getStyles = function( elem ) {
|
|
||||||
return elem.currentStyle;
|
|
||||||
};
|
|
||||||
|
|
||||||
curCSS = function( elem, name, _computed ) {
|
|
||||||
var left, rs, rsLeft,
|
|
||||||
computed = _computed || getStyles( elem ),
|
|
||||||
ret = computed ? computed[ name ] : undefined,
|
|
||||||
style = elem.style;
|
|
||||||
|
|
||||||
// Avoid setting ret to empty string here
|
|
||||||
// so we don't default to auto
|
|
||||||
if ( ret == null && style && style[ name ] ) {
|
|
||||||
ret = style[ name ];
|
|
||||||
}
|
|
||||||
|
|
||||||
// From the awesome hack by Dean Edwards
|
|
||||||
// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
|
|
||||||
|
|
||||||
// If we're not dealing with a regular pixel number
|
|
||||||
// but a number that has a weird ending, we need to convert it to pixels
|
|
||||||
// but not position css attributes, as those are proportional to the parent element instead
|
|
||||||
// and we can't measure the parent instead because it might trigger a "stacking dolls" problem
|
|
||||||
if ( rnumnonpx.test( ret ) && !rposition.test( name ) ) {
|
|
||||||
|
|
||||||
// Remember the original values
|
|
||||||
left = style.left;
|
|
||||||
rs = elem.runtimeStyle;
|
|
||||||
rsLeft = rs && rs.left;
|
|
||||||
|
|
||||||
// Put in the new values to get a computed value out
|
|
||||||
if ( rsLeft ) {
|
|
||||||
rs.left = elem.currentStyle.left;
|
|
||||||
}
|
|
||||||
style.left = name === "fontSize" ? "1em" : ret;
|
|
||||||
ret = style.pixelLeft + "px";
|
|
||||||
|
|
||||||
// Revert the changed values
|
|
||||||
style.left = left;
|
|
||||||
if ( rsLeft ) {
|
|
||||||
rs.left = rsLeft;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return ret === "" ? "auto" : ret;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
function setPositiveNumber( elem, value, subtract ) {
|
|
||||||
var matches = rnumsplit.exec( value );
|
|
||||||
return matches ?
|
|
||||||
// Guard against undefined "subtract", e.g., when used as in cssHooks
|
|
||||||
Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) :
|
|
||||||
value;
|
|
||||||
}
|
|
||||||
|
|
||||||
function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) {
|
|
||||||
var i = extra === ( isBorderBox ? "border" : "content" ) ?
|
|
||||||
// If we already have the right measurement, avoid augmentation
|
|
||||||
4 :
|
|
||||||
// Otherwise initialize for horizontal or vertical properties
|
|
||||||
name === "width" ? 1 : 0,
|
|
||||||
|
|
||||||
val = 0;
|
|
||||||
|
|
||||||
for ( ; i < 4; i += 2 ) {
|
|
||||||
// both box models exclude margin, so add it if we want it
|
|
||||||
if ( extra === "margin" ) {
|
|
||||||
val += jQuery.css( elem, extra + cssExpand[ i ], true, styles );
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( isBorderBox ) {
|
|
||||||
// border-box includes padding, so remove it if we want content
|
|
||||||
if ( extra === "content" ) {
|
|
||||||
val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
|
|
||||||
}
|
|
||||||
|
|
||||||
// at this point, extra isn't border nor margin, so remove border
|
|
||||||
if ( extra !== "margin" ) {
|
|
||||||
val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// at this point, extra isn't content, so add padding
|
|
||||||
val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
|
|
||||||
|
|
||||||
// at this point, extra isn't content nor padding, so add border
|
|
||||||
if ( extra !== "padding" ) {
|
|
||||||
val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return val;
|
|
||||||
}
|
|
||||||
|
|
||||||
function getWidthOrHeight( elem, name, extra ) {
|
|
||||||
|
|
||||||
// Start with offset property, which is equivalent to the border-box value
|
|
||||||
var valueIsBorderBox = true,
|
|
||||||
val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
|
|
||||||
styles = getStyles( elem ),
|
|
||||||
isBorderBox = support.boxSizing() && jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
|
|
||||||
|
|
||||||
// some non-html elements return undefined for offsetWidth, so check for null/undefined
|
|
||||||
// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
|
|
||||||
// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
|
|
||||||
if ( val <= 0 || val == null ) {
|
|
||||||
// Fall back to computed then uncomputed css if necessary
|
|
||||||
val = curCSS( elem, name, styles );
|
|
||||||
if ( val < 0 || val == null ) {
|
|
||||||
val = elem.style[ name ];
|
|
||||||
}
|
|
||||||
|
|
||||||
// Computed unit is not pixels. Stop here and return.
|
|
||||||
if ( rnumnonpx.test(val) ) {
|
|
||||||
return val;
|
|
||||||
}
|
|
||||||
|
|
||||||
// we need the check for style in case a browser which returns unreliable values
|
|
||||||
// for getComputedStyle silently falls back to the reliable elem.style
|
|
||||||
valueIsBorderBox = isBorderBox && ( support.boxSizingReliable() || val === elem.style[ name ] );
|
|
||||||
|
|
||||||
// Normalize "", auto, and prepare for extra
|
|
||||||
val = parseFloat( val ) || 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
// use the active box-sizing model to add/subtract irrelevant styles
|
|
||||||
return ( val +
|
|
||||||
augmentWidthOrHeight(
|
|
||||||
elem,
|
|
||||||
name,
|
|
||||||
extra || ( isBorderBox ? "border" : "content" ),
|
|
||||||
valueIsBorderBox,
|
|
||||||
styles
|
|
||||||
)
|
|
||||||
) + "px";
|
|
||||||
}
|
|
||||||
|
|
||||||
jQuery.each([ "height", "width" ], function( i, name ) {
|
jQuery.each([ "height", "width" ], function( i, name ) {
|
||||||
jQuery.cssHooks[ name ] = {
|
jQuery.cssHooks[ name ] = {
|
||||||
get: function( elem, computed, extra ) {
|
get: function( elem, computed, extra ) {
|
||||||
@ -640,5 +596,49 @@ jQuery.each({
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
jQuery.fn.extend({
|
||||||
|
css: function( name, value ) {
|
||||||
|
return jQuery.access( this, function( elem, name, value ) {
|
||||||
|
var len, styles,
|
||||||
|
map = {},
|
||||||
|
i = 0;
|
||||||
|
|
||||||
|
if ( jQuery.isArray( name ) ) {
|
||||||
|
styles = getStyles( elem );
|
||||||
|
len = name.length;
|
||||||
|
|
||||||
|
for ( ; i < len; i++ ) {
|
||||||
|
map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles );
|
||||||
|
}
|
||||||
|
|
||||||
|
return map;
|
||||||
|
}
|
||||||
|
|
||||||
|
return value !== undefined ?
|
||||||
|
jQuery.style( elem, name, value ) :
|
||||||
|
jQuery.css( elem, name );
|
||||||
|
}, name, value, arguments.length > 1 );
|
||||||
|
},
|
||||||
|
show: function() {
|
||||||
|
return showHide( this, true );
|
||||||
|
},
|
||||||
|
hide: function() {
|
||||||
|
return showHide( this );
|
||||||
|
},
|
||||||
|
toggle: function( state ) {
|
||||||
|
if ( typeof state === "boolean" ) {
|
||||||
|
return state ? this.show() : this.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.each(function() {
|
||||||
|
if ( isHidden( this ) ) {
|
||||||
|
jQuery( this ).show();
|
||||||
|
} else {
|
||||||
|
jQuery( this ).hide();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
return jQuery;
|
return jQuery;
|
||||||
});
|
});
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user