var elemdisplay = {},
rfxtypes = /^(?:toggle|show|hide)$/,
- rfxnum = /^([+\-]=)?([\d+.\-]+)(.*)$/,
+ rfxnum = /^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,
timerId,
fxAttrs = [
// height animations
// Reset the inline display of this element to learn if it is
// being hidden by cascaded rules or not
- if ( !jQuery.data(elem, "olddisplay") && display === "none" ) {
+ if ( !jQuery._data(elem, "olddisplay") && display === "none" ) {
display = elem.style.display = "";
}
// in a stylesheet to whatever the default browser style is
// for such an element
if ( display === "" && jQuery.css( elem, "display" ) === "none" ) {
- jQuery.data(elem, "olddisplay", defaultDisplay(elem.nodeName));
+ jQuery._data(elem, "olddisplay", defaultDisplay(elem.nodeName));
}
}
display = elem.style.display;
if ( display === "" || display === "none" ) {
- elem.style.display = jQuery.data(elem, "olddisplay") || "";
+ elem.style.display = jQuery._data(elem, "olddisplay") || "";
}
}
} else {
for ( var i = 0, j = this.length; i < j; i++ ) {
var display = jQuery.css( this[i], "display" );
-
- if ( display !== "none" && !jQuery.data( this[i], "olddisplay" ) ) {
- jQuery.data( this[i], "olddisplay", display );
- }
+
+ if ( display !== "none" && !jQuery._data( this[i], "olddisplay" ) ) {
+ jQuery._data( this[i], "olddisplay", display );
+ }
}
// Set the display of the elements in a second loop
if ( parts ) {
var end = parseFloat( parts[2] ),
- unit = parts[3] || "px";
+ unit = parts[3] || ( jQuery.cssNumber[ name ] ? "" : "px" );
// We need to compute starting value
if ( unit !== "px" ) {
}
var r = parseFloat( jQuery.css( this.elem, this.prop ) );
- return r && r > -10000 ? r : 0;
+ return r || 0;
},
// Start an animation from one number to another
this.startTime = jQuery.now();
this.start = from;
this.end = to;
- this.unit = unit || this.unit || "px";
+ this.unit = unit || this.unit || ( jQuery.cssNumber[ this.prop ] ? "" : "px" );
this.now = this.start;
this.pos = this.state = 0;
}
function defaultDisplay( nodeName ) {
+ var stylesheets = document.styleSheets,
+ disabled = [],
+ elem, display, style, idx;
+
if ( !elemdisplay[ nodeName ] ) {
- var elem = jQuery("<" + nodeName + ">").appendTo("body"),
- display = elem.css("display");
+ // #8099 - If the end-dev has globally changed a default
+ // display, we can temporarily disable their styles to check
+ // for the correct default value
+ for ( idx = 0; idx < stylesheets.length; ++idx ) {
+ style = stylesheets[ idx ];
+ disabled[ idx ] = style.disabled;
+ style.disabled = true;
+ }
+
+ // To accurately check an element's default display value,
+ // create a temp element and check it's default display, this
+ // will ensure that the value returned is not a user-tampered
+ // value.
+ elem = jQuery("<" + nodeName + ">").appendTo("body"),
+ display = elem.css("display");
+
+ // Remove temp element
elem.remove();
if ( display === "none" || display === "" ) {
display = "block";
}
-
+
+ // Store the correct default display
elemdisplay[ nodeName ] = display;
+
+ // Restore stylesheets
+ for ( idx = 0; idx < stylesheets.length; ++idx ) {
+ stylesheets[ idx ].disabled = disabled[ idx ];
+ }
}
return elemdisplay[ nodeName ];