git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Split apart jQuery.css into jQuery.css (computed values) and jQuery.style (currently...
[jquery.git]
/
src
/
effects.js
diff --git
a/src/effects.js
b/src/effects.js
index
5d656c9
..
eeab9b7
100644
(file)
--- a/
src/effects.js
+++ b/
src/effects.js
@@
-1,6
+1,9
@@
+(function( jQuery ) {
+
var elemdisplay = {},
rfxtypes = /toggle|show|hide/,
var elemdisplay = {},
rfxtypes = /toggle|show|hide/,
- rfxnum = /^([+-]=)?([\d+-.]+)(.*)$/,
+ rfxnum = /^([+\-]=)?([\d+.\-]+)(.*)$/,
+ rdashAlpha = /-([a-z])/ig,
timerId,
fxAttrs = [
// height animations
timerId,
fxAttrs = [
// height animations
@@
-9,20
+12,24
@@
var elemdisplay = {},
[ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ],
// opacity animations
[ "opacity" ]
[ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ],
// opacity animations
[ "opacity" ]
- ];
+ ],
+
+ fcamelCase = function( all, letter ) {
+ return letter.toUpperCase();
+ };
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 {
- for ( var i = 0, l = this.length; i < l; i++ ){
+ for ( var i = 0, l = this.length; i < l; i++ ) {
var old = jQuery.data(this[i], "olddisplay");
this[i].style.display = old || "";
var old = jQuery.data(this[i], "olddisplay");
this[i].style.display = old || "";
- if ( jQuery.css(this[i], "display") === "none" ) {
+ if ( jQuery.css( this[i], "display" ) === "none" ) {
var nodeName = this[i].nodeName, display;
if ( elemdisplay[ nodeName ] ) {
var nodeName = this[i].nodeName, display;
if ( elemdisplay[ nodeName ] ) {
@@
-48,7
+55,7
@@
jQuery.fn.extend({
// Set the display of the elements in a second loop
// to avoid the constant reflow
// Set the display of the elements in a second loop
// to avoid the constant reflow
- for ( var j = 0, k = this.length; j < k; j++ ){
+ for ( var j = 0, k = this.length; j < k; j++ ) {
this[j].style.display = jQuery.data(this[j], "olddisplay") || "";
}
this[j].style.display = jQuery.data(this[j], "olddisplay") || "";
}
@@
-57,20
+64,20
@@
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 {
- for ( var i = 0, l = this.length; i < l; i++ ){
+ for ( var i = 0, l = this.length; i < l; i++ ) {
var old = jQuery.data(this[i], "olddisplay");
var old = jQuery.data(this[i], "olddisplay");
- if ( !old && old !== "none" ){
- jQuery.data(this[i], "olddisplay", jQuery.css(this[i], "display"));
+ if ( !old && old !== "none" ) {
+ jQuery.data( this[i], "olddisplay", jQuery.css( this[i], "display" ) );
}
}
// Set the display of the elements in a second loop
// to avoid the constant reflow
}
}
// Set the display of the elements in a second loop
// to avoid the constant reflow
- for ( var j = 0, k = this.length; j < k; j++ ){
+ for ( var j = 0, k = this.length; j < k; j++ ) {
this[j].style.display = "none";
}
this[j].style.display = "none";
}
@@
-88,7
+95,7
@@
jQuery.fn.extend({
this._toggle.apply( this, arguments );
} else if ( fn == null || bool ) {
this._toggle.apply( this, arguments );
} else if ( fn == null || bool ) {
- this.each(function(){
+ this.each(function() {
var state = bool ? fn : jQuery(this).is(":hidden");
jQuery(this)[ state ? "show" : "hide" ]();
});
var state = bool ? fn : jQuery(this).is(":hidden");
jQuery(this)[ state ? "show" : "hide" ]();
});
@@
-132,7
+139,7
@@
jQuery.fn.extend({
if ( ( p === "height" || p === "width" ) && this.style ) {
// Store display property
if ( ( p === "height" || p === "width" ) && this.style ) {
// Store display property
- opt.display = jQuery.css(this, "display");
+ opt.display = this.style.display;
// Make sure that nothing sneaks out
opt.overflow = this.style.overflow;
// Make sure that nothing sneaks out
opt.overflow = this.style.overflow;
@@
-190,14
+197,14
@@
jQuery.fn.extend({
});
},
});
},
- stop: function(clearQueue, gotoEnd){
+ stop: function( clearQueue, gotoEnd ) {
var timers = jQuery.timers;
if ( clearQueue ) {
this.queue([]);
}
var timers = jQuery.timers;
if ( clearQueue ) {
this.queue([]);
}
- this.each(function(){
+ this.each(function() {
// go in reverse order so anything added to the queue during the loop is ignored
for ( var i = timers.length - 1; i >= 0; i-- ) {
if ( timers[i].elem === this ) {
// go in reverse order so anything added to the queue during the loop is ignored
for ( var i = timers.length - 1; i >= 0; i-- ) {
if ( timers[i].elem === this ) {
@@
-221,6
+228,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),
@@
-228,8
+245,8
@@
jQuery.each({
slideToggle: genFx("toggle", 1),
fadeIn: { opacity: "show" },
fadeOut: { opacity: "hide" }
slideToggle: genFx("toggle", 1),
fadeIn: { opacity: "show" },
fadeOut: { opacity: "hide" }
-}, function( name, props ){
- jQuery.fn[ name ] = function( speed, callback ){
+}, function( name, props ) {
+ jQuery.fn[ name ] = function( speed, callback ) {
return this.animate( props, speed, callback );
};
});
return this.animate( props, speed, callback );
};
});
@@
-248,7
+265,7
@@
jQuery.extend({
// Queueing
opt.old = opt.complete;
// Queueing
opt.old = opt.complete;
- opt.complete = function(){
+ opt.complete = function() {
if ( opt.queue !== false ) {
jQuery(this).dequeue();
}
if ( opt.queue !== false ) {
jQuery(this).dequeue();
}
@@
-299,18
+316,18
@@
jQuery.fx.prototype = {
},
// Get the current size
},
// Get the current size
- cur: function( force ) {
+ cur: function() {
if ( this.elem[this.prop] != null && (!this.elem.style || this.elem.style[this.prop] == null) ) {
return this.elem[ this.prop ];
}
if ( this.elem[this.prop] != null && (!this.elem.style || this.elem.style[this.prop] == null) ) {
return this.elem[ this.prop ];
}
- var r = parseFloat(jQuery.css(this.elem, this.prop, force));
- return r && r > -10000 ? r : parseFloat(jQuery.curCSS(this.elem, this.prop)) || 0;
+ var r = jQuery.css( this.elem, this.prop );
+ return r && r > -10000 ? r : 0;
},
// 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
+373,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;
@@
-380,7
+397,7
@@
jQuery.fx.prototype = {
var old = jQuery.data(this.elem, "olddisplay");
this.elem.style.display = old ? old : this.options.display;
var old = jQuery.data(this.elem, "olddisplay");
this.elem.style.display = old ? old : this.options.display;
- if ( jQuery.css(this.elem, "display") === "none" ) {
+ if ( jQuery.css( this.elem, "display" ) === "none" ) {
this.elem.style.display = "block";
}
}
this.elem.style.display = "block";
}
}
@@
-393,7
+410,7
@@
jQuery.fx.prototype = {
// Reset the properties, if the item has been hidden or shown
if ( this.options.hide || this.options.show ) {
for ( var p in this.options.curAnim ) {
// Reset the properties, if the item has been hidden or shown
if ( this.options.hide || this.options.show ) {
for ( var p in this.options.curAnim ) {
- jQuery.style(this.elem, p, this.options.orig[p]);
+ jQuery.style( this.elem, p, this.options.orig[p] );
}
}
}
}
@@
-443,14
+460,14
@@
jQuery.extend( jQuery.fx, {
speeds: {
slow: 600,
speeds: {
slow: 600,
- fast: 200,
- // Default speed
- _default: 400
+ fast: 200,
+ // Default speed
+ _default: 400
},
step: {
opacity: function( fx ) {
},
step: {
opacity: function( fx ) {
- jQuery.style(fx.elem, "opacity", fx.now);
+ jQuery.style( fx.elem, "opacity", fx.now );
},
_default: function( fx ) {
},
_default: function( fx ) {
@@
-464,19
+481,11
@@
jQuery.extend( jQuery.fx, {
});
if ( jQuery.expr && jQuery.expr.filters ) {
});
if ( jQuery.expr && jQuery.expr.filters ) {
- jQuery.expr.filters.animated = function(elem){
- return jQuery.grep(jQuery.timers, function(fn){
+ jQuery.expr.filters.animated = function( elem ) {
+ return jQuery.grep(jQuery.timers, function( fn ) {
return elem === fn.elem;
}).length;
};
}
return elem === fn.elem;
}).length;
};
}
-function genFx( type, num ) {
- var obj = {};
-
- jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function(){
- obj[ this ] = type;
- });
-
- return obj;
-}
+})( jQuery );