git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Forgot the 'var' statement, causing variables to leak. (Bug #1592)
[jquery.git]
/
src
/
fx.js
diff --git
a/src/fx.js
b/src/fx.js
index
c45edc1
..
d75f3d0
100644
(file)
--- a/
src/fx.js
+++ b/
src/fx.js
@@
-96,12
+96,12
@@
jQuery.fn.extend({
if ( /toggle|show|hide/.test(val) )
e[ val == "toggle" ? hidden ? "show" : "hide" : val ]( prop );
else {
if ( /toggle|show|hide/.test(val) )
e[ val == "toggle" ? hidden ? "show" : "hide" : val ]( prop );
else {
- var parts = val.toString().match(/^([+-]?)([\d.]+)(.*)$/),
+ var parts = val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),
start = e.cur(true) || 0;
if ( parts ) {
start = e.cur(true) || 0;
if ( parts ) {
- end = parseFloat(parts[2]),
- unit = parts[3] || "px";
+ var end = parseFloat(parts[2]),
+ unit = parts[3] || "px";
// We need to compute starting value
if ( unit != "px" ) {
// We need to compute starting value
if ( unit != "px" ) {
@@
-110,9
+110,9
@@
jQuery.fn.extend({
self.style[ name ] = start + unit;
}
self.style[ name ] = start + unit;
}
- // If a +/- token was provided, we're doing a relative animation
+ // If a +=/-= token was provided, we're doing a relative animation
if ( parts[1] )
if ( parts[1] )
- end = ((parts[1] == "-" ? -1 : 1) * end) + start;
+ end = ((parts[1] == "-=" ? -1 : 1) * end) + start;
e.custom( start, end, unit );
} else
e.custom( start, end, unit );
} else
@@
-126,12
+126,12
@@
jQuery.fn.extend({
},
queue: function(type, fn){
},
queue: function(type, fn){
- if ( !fn ) {
+ if ( jQuery.isFunction(type) ) {
fn = type;
type = "fx";
}
fn = type;
type = "fx";
}
- if ( !arguments.length )
+ if ( !type || (typeof type == "string" && !fn) )
return queue( this[0], type );
return this.each(function(){
return queue( this[0], type );
return this.each(function(){
@@
-146,19
+146,6
@@
jQuery.fn.extend({
});
},
});
},
- dequeue: function(type){
- type = type || "fx";
-
- return this.each(function(){
- var q = queue(this, type);
-
- q.shift();
-
- if ( q.length )
- q[0].apply( this );
- });
- },
-
stop: function(){
var timers = jQuery.timers;
stop: function(){
var timers = jQuery.timers;
@@
-171,18
+158,31
@@
jQuery.fn.extend({
});
});
-function queue( elem, type, array ) {
+var queue = function( elem, type, array ) {
if ( !elem )
return;
if ( !elem )
return;
- var queue = jQuery.data( elem, type + "queue" );
+ var q = jQuery.data( elem, type + "queue" );
- if ( !queue || array )
- queue = jQuery.data( elem, type + "queue",
+ if ( !q || array )
+ q = jQuery.data( elem, type + "queue",
array ? jQuery.makeArray(array) : [] );
array ? jQuery.makeArray(array) : [] );
- return queue;
-}
+ return q;
+};
+
+jQuery.fn.dequeue = function(type){
+ type = type || "fx";
+
+ return this.each(function(){
+ var q = queue(this, type);
+
+ q.shift();
+
+ if ( q.length )
+ q[0].apply( this );
+ });
+};
jQuery.extend({
jQuery.extend({