git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bringing in the rdashAlpha/fcamelCase private var tweaks from the csshooks branch.
[jquery.git]
/
src
/
effects.js
diff --git
a/src/effects.js
b/src/effects.js
index
97456cc
..
73d94ef
100644
(file)
--- a/
src/effects.js
+++ b/
src/effects.js
@@
-1,6
+1,9
@@
+(function( jQuery ) {
+
var elemdisplay = {},
rfxtypes = /toggle|show|hide/,
rfxnum = /^([+\-]=)?([\d+.\-]+)(.*)$/,
var elemdisplay = {},
rfxtypes = /toggle|show|hide/,
rfxnum = /^([+\-]=)?([\d+.\-]+)(.*)$/,
+ rdashAlpha = /-([a-z])/ig,
timerId,
fxAttrs = [
// height animations
timerId,
fxAttrs = [
// height animations
@@
-9,7
+12,11
@@
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 ) {
@@
-320,7
+327,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";
@@
-366,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;
@@
-480,3
+487,5
@@
if ( jQuery.expr && jQuery.expr.filters ) {
}).length;
};
}
}).length;
};
}
+
+})( jQuery );