git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sure that jQuery works even when the individual modules are loaded separately...
[jquery.git]
/
src
/
effects.js
diff --git
a/src/effects.js
b/src/effects.js
index
ff2f145
..
65b9e0f
100644
(file)
--- a/
src/effects.js
+++ b/
src/effects.js
@@
-1,6
+1,8
@@
+(function( jQuery ) {
+
var elemdisplay = {},
rfxtypes = /toggle|show|hide/,
var elemdisplay = {},
rfxtypes = /toggle|show|hide/,
- rfxnum = /^([+-]=)?([\d+-.]+)(.*)$/,
+ rfxnum = /^([+\-]=)?([\d+.\-]+)(.*)$/,
timerId,
fxAttrs = [
// height animations
timerId,
fxAttrs = [
// height animations
@@
-13,7
+15,7
@@
var elemdisplay = {},
jQuery.fn.extend({
show: function( speed, callback ) {
jQuery.fn.extend({
show: function( speed, callback ) {
- if ( speed != null ) {
+ if ( speed || speed === 0) {
return this.animate( genFx("show", 3), speed, callback);
} else {
return this.animate( genFx("show", 3), speed, callback);
} else {
@@
-57,7
+59,7
@@
jQuery.fn.extend({
},
hide: function( speed, callback ) {
},
hide: function( speed, callback ) {
- if ( speed != null ) {
+ if ( speed || speed === 0 ) {
return this.animate( genFx("hide", 3), speed, callback);
} else {
return this.animate( genFx("hide", 3), speed, callback);
} else {
@@
-221,6
+223,16
@@
jQuery.fn.extend({
});
});
+function genFx( type, num ) {
+ var obj = {};
+
+ jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function() {
+ obj[ this ] = type;
+ });
+
+ return obj;
+}
+
// Generate shortcuts for custom animations
jQuery.each({
slideDown: genFx("show", 1),
// Generate shortcuts for custom animations
jQuery.each({
slideDown: genFx("show", 1),
@@
-310,7
+322,7
@@
jQuery.fx.prototype = {
// Start an animation from one number to another
custom: function( from, to, unit ) {
// Start an animation from one number to another
custom: function( from, to, unit ) {
- this.startTime = now();
+ this.startTime = jQuery.now();
this.start = from;
this.end = to;
this.unit = unit || this.unit || "px";
this.start = from;
this.end = to;
this.unit = unit || this.unit || "px";
@@
-356,7
+368,7
@@
jQuery.fx.prototype = {
// Each step of an animation
step: function( gotoEnd ) {
// Each step of an animation
step: function( gotoEnd ) {
- var t = now(), done = true;
+ var t = jQuery.now(), done = true;
if ( gotoEnd || t >= this.options.duration + this.startTime ) {
this.now = this.end;
if ( gotoEnd || t >= this.options.duration + this.startTime ) {
this.now = this.end;
@@
-443,9
+455,9
@@
jQuery.extend( jQuery.fx, {
speeds: {
slow: 600,
speeds: {
slow: 600,
- fast: 200,
- // Default speed
- _default: 400
+ fast: 200,
+ // Default speed
+ _default: 400
},
step: {
},
step: {
@@
-471,12
+483,4
@@
if ( jQuery.expr && jQuery.expr.filters ) {
};
}
};
}
-function genFx( type, num ) {
- var obj = {};
-
- jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function() {
- obj[ this ] = type;
- });
-
- return obj;
-}
+})( jQuery );