git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update Rakefile to remove module wrappers (feature parity with make and ant). Update...
[jquery.git]
/
src
/
effects.js
diff --git
a/src/effects.js
b/src/effects.js
index
482c44d
..
bd57ffc
100644
(file)
--- a/
src/effects.js
+++ b/
src/effects.js
@@
-2,7
+2,7
@@
var elemdisplay = {},
rfxtypes = /^(?:toggle|show|hide)$/,
var elemdisplay = {},
rfxtypes = /^(?:toggle|show|hide)$/,
- rfxnum = /^([+\-]=)?([\d+.\-]+)(.*)$/,
+ rfxnum = /^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,
timerId,
fxAttrs = [
// height animations
timerId,
fxAttrs = [
// height animations
@@
-61,9
+61,9
@@
jQuery.fn.extend({
} else {
for ( var i = 0, j = this.length; i < j; i++ ) {
var display = jQuery.css( this[i], "display" );
} 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" ) ) {
if ( display !== "none" && !jQuery.data( this[i], "olddisplay" ) ) {
- jQuery.data( this[i], "olddisplay", display );
+ jQuery.data( this[i], "olddisplay", display );
}
}
}
}
@@
-337,7
+337,7
@@
jQuery.fx.prototype = {
}
var r = parseFloat( jQuery.css( this.elem, this.prop ) );
}
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
},
// Start an animation from one number to another