mirror of
https://github.com/jquery/jquery.git
synced 2026-02-06 09:45:07 -05:00
Effects: 1.8 Animation Rewrite - thanks @mikesherov and @gibson042
This commit is contained in:
committed by
Dave Methvin
parent
8ad22a2b15
commit
58ed62ed12
24
src/css.js
24
src/css.js
@@ -1,10 +1,12 @@
|
||||
(function( jQuery ) {
|
||||
|
||||
jQuery.cssExpand = [ "Top", "Right", "Bottom", "Left" ];
|
||||
|
||||
var ralpha = /alpha\([^)]*\)/i,
|
||||
ropacity = /opacity=([^)]*)/,
|
||||
// fixed for IE9, see #8346
|
||||
rupper = /([A-Z]|^ms)/g,
|
||||
rnum = /^[\-+]?(?:\d*\.)?\d+$/i,
|
||||
rnumsplit = /^([\-+]?(?:\d*\.)?\d+)(.*)$/i,
|
||||
rnumnonpx = /^-?(?:\d*\.)?\d+(?!px)[^\d\s]+$/i,
|
||||
rrelNum = /^([\-+])=([\-+.\de]+)/,
|
||||
rmargin = /^margin/,
|
||||
@@ -12,7 +14,7 @@ var ralpha = /alpha\([^)]*\)/i,
|
||||
cssShow = { position: "absolute", visibility: "hidden", display: "block" },
|
||||
|
||||
// order is important!
|
||||
cssExpand = [ "Top", "Right", "Bottom", "Left" ],
|
||||
cssExpand = jQuery.cssExpand,
|
||||
cssPrefixes = [ "O", "Webkit", "Moz", "ms" ],
|
||||
|
||||
curCSS;
|
||||
@@ -264,6 +266,13 @@ if ( document.defaultView && document.defaultView.getComputedStyle ) {
|
||||
};
|
||||
}
|
||||
|
||||
function setPositiveNumber( elem, value ) {
|
||||
var matches = rnumsplit.exec( value );
|
||||
return matches ?
|
||||
Math.max( 0, matches[ 1 ] ) + ( matches [ 2 ] || "px" )
|
||||
: value;
|
||||
}
|
||||
|
||||
function getWidthOrHeight( elem, name, extra ) {
|
||||
|
||||
// Start with offset property, which is equivalent to the border-box value
|
||||
@@ -348,11 +357,7 @@ jQuery.each([ "height", "width" ], function( i, name ) {
|
||||
}
|
||||
},
|
||||
|
||||
set: function( elem, value ) {
|
||||
return rnum.test( value ) ?
|
||||
value + "px" :
|
||||
value;
|
||||
}
|
||||
set: setPositiveNumber
|
||||
};
|
||||
});
|
||||
|
||||
@@ -436,7 +441,6 @@ jQuery.each({
|
||||
padding: "",
|
||||
border: "Width"
|
||||
}, function( prefix, suffix ) {
|
||||
|
||||
jQuery.cssHooks[ prefix + suffix ] = {
|
||||
expand: function( value ) {
|
||||
var i,
|
||||
@@ -453,6 +457,10 @@ jQuery.each({
|
||||
return expanded;
|
||||
}
|
||||
};
|
||||
|
||||
if ( !rmargin.test( prefix ) ) {
|
||||
jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
|
||||
}
|
||||
});
|
||||
|
||||
})( jQuery );
|
||||
|
||||
1137
src/effects.js
vendored
1137
src/effects.js
vendored
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user