git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added a fix for .noConflict(true) not reverting properly. Also added unit tests for...
[jquery.git]
/
src
/
fx.js
diff --git
a/src/fx.js
b/src/fx.js
index
d75f3d0
..
a4f4ef8
100644
(file)
--- a/
src/fx.js
+++ b/
src/fx.js
@@
-66,10
+66,10
@@
jQuery.fn.extend({
},
animate: function( prop, speed, easing, callback ) {
},
animate: function( prop, speed, easing, callback ) {
- var opt = jQuery.speed(speed, easing, callback);
+ var optall = jQuery.speed(speed, easing, callback);
- return this[ opt.queue === false ? "each" : "queue" ](function(){
- opt = jQuery.extend({}, opt);
+ return this[ optall.queue === false ? "each" : "queue" ](function(){
+ var opt = jQuery.extend({}, optall);
var hidden = jQuery(this).is(":hidden"), self = this;
for ( var p in prop ) {
var hidden = jQuery(this).is(":hidden"), self = this;
for ( var p in prop ) {
@@
-105,8
+105,8
@@
jQuery.fn.extend({
// We need to compute starting value
if ( unit != "px" ) {
// We need to compute starting value
if ( unit != "px" ) {
- self.style[ name ] = end + unit;
- start = (end / e.cur(true)) * start;
+ self.style[ name ] = (end || 1) + unit;
+ start = ((end || 1) / e.cur(true)) * start;
self.style[ name ] = start + unit;
}
self.style[ name ] = start + unit;
}