git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Using data() on JavaScript objects sets fields directly on the object. Note that...
[jquery.git]
/
src
/
effects.js
diff --git
a/src/effects.js
b/src/effects.js
index
87d0f4d
..
56141bb
100644
(file)
--- a/
src/effects.js
+++ b/
src/effects.js
@@
-14,9
+14,9
@@
var elemdisplay = {},
];
jQuery.fn.extend({
];
jQuery.fn.extend({
- show: function( speed, callback ) {
+ show: function( speed, easing, callback ) {
if ( speed || speed === 0) {
if ( speed || speed === 0) {
- return this.animate( genFx("show", 3), speed, callback);
+ return this.animate( genFx("show", 3), speed, easing, callback);
} else {
for ( var i = 0, l = this.length; i < l; i++ ) {
} else {
for ( var i = 0, l = this.length; i < l; i++ ) {
@@
-58,9
+58,9
@@
jQuery.fn.extend({
}
},
}
},
- hide: function( speed, callback ) {
+ hide: function( speed, easing, callback ) {
if ( speed || speed === 0 ) {
if ( speed || speed === 0 ) {
- return this.animate( genFx("hide", 3), speed, callback);
+ return this.animate( genFx("hide", 3), speed, easing, callback);
} else {
for ( var i = 0, l = this.length; i < l; i++ ) {
} else {
for ( var i = 0, l = this.length; i < l; i++ ) {
@@
-83,7
+83,7
@@
jQuery.fn.extend({
// Save the old toggle function
_toggle: jQuery.fn.toggle,
// Save the old toggle function
_toggle: jQuery.fn.toggle,
- toggle: function( fn, fn2 ) {
+ toggle: function( fn, fn2, callback ) {
var bool = typeof fn === "boolean";
if ( jQuery.isFunction(fn) && jQuery.isFunction(fn2) ) {
var bool = typeof fn === "boolean";
if ( jQuery.isFunction(fn) && jQuery.isFunction(fn2) ) {
@@
-96,15
+96,15
@@
jQuery.fn.extend({
});
} else {
});
} else {
- this.animate(genFx("toggle", 3), fn, fn2);
+ this.animate(genFx("toggle", 3), fn, fn2, callback);
}
return this;
},
}
return this;
},
- fadeTo: function( speed, to, callback ) {
+ fadeTo: function( speed, to, easing, callback ) {
return this.filter(":hidden").css("opacity", 0).show().end()
return this.filter(":hidden").css("opacity", 0).show().end()
- .animate({opacity: to}, speed, callback);
+ .animate({opacity: to}, speed, easing, callback);
},
animate: function( prop, speed, easing, callback ) {
},
animate: function( prop, speed, easing, callback ) {
@@
-241,14
+241,14
@@
jQuery.each({
fadeIn: { opacity: "show" },
fadeOut: { opacity: "hide" }
}, function( name, props ) {
fadeIn: { opacity: "show" },
fadeOut: { opacity: "hide" }
}, function( name, props ) {
- jQuery.fn[ name ] = function( speed, callback ) {
- return this.animate( props, speed, callback );
+ jQuery.fn[ name ] = function( speed, easing, callback ) {
+ return this.animate( props, speed, easing, callback );
};
});
jQuery.extend({
speed: function( speed, easing, fn ) {
};
});
jQuery.extend({
speed: function( speed, easing, fn ) {
- var opt = speed && typeof speed === "object" ? speed : {
+ var opt = speed && typeof speed === "object" ? jQuery.extend({}, speed) : {
complete: fn || !fn && easing ||
jQuery.isFunction( speed ) && speed,
duration: speed,
complete: fn || !fn && easing ||
jQuery.isFunction( speed ) && speed,
duration: speed,
@@
-256,7
+256,7
@@
jQuery.extend({
};
opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
};
opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
- jQuery.fx.speeds[opt.duration] || jQuery.fx.speeds._default;
+ opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[opt.duration] : jQuery.fx.speeds._default;
// Queueing
opt.old = opt.complete;
// Queueing
opt.old = opt.complete;
@@
-329,7
+329,7
@@
jQuery.fx.prototype = {
this.now = this.start;
this.pos = this.state = 0;
this.now = this.start;
this.pos = this.state = 0;
- var self = this;
+ var self = this, fx = jQuery.fx;
function t( gotoEnd ) {
return self.step(gotoEnd);
}
function t( gotoEnd ) {
return self.step(gotoEnd);
}
@@
-337,7
+337,7
@@
jQuery.fx.prototype = {
t.elem = this.elem;
if ( t() && jQuery.timers.push(t) && !timerId ) {
t.elem = this.elem;
if ( t() && jQuery.timers.push(t) && !timerId ) {
- timerId = setInterval(jQuery.fx.tick, 13);
+ timerId = setInterval(fx.tick, fx.interval);
}
},
}
},
@@
-447,6
+447,8
@@
jQuery.extend( jQuery.fx, {
jQuery.fx.stop();
}
},
jQuery.fx.stop();
}
},
+
+ interval: 13,
stop: function() {
clearInterval( timerId );
stop: function() {
clearInterval( timerId );