Forgot the 'var' statement, causing variables to leak. (Bug #1592)
[jquery.git] / src / fx.js
1 jQuery.fn.extend({
2         show: function(speed,callback){
3                 return speed ?
4                         this.animate({
5                                 height: "show", width: "show", opacity: "show"
6                         }, speed, callback) :
7                         
8                         this.filter(":hidden").each(function(){
9                                 this.style.display = this.oldblock ? this.oldblock : "";
10                                 if ( jQuery.css(this,"display") == "none" )
11                                         this.style.display = "block";
12                         }).end();
13         },
14         
15         hide: function(speed,callback){
16                 return speed ?
17                         this.animate({
18                                 height: "hide", width: "hide", opacity: "hide"
19                         }, speed, callback) :
20                         
21                         this.filter(":visible").each(function(){
22                                 this.oldblock = this.oldblock || jQuery.css(this,"display");
23                                 if ( this.oldblock == "none" )
24                                         this.oldblock = "block";
25                                 this.style.display = "none";
26                         }).end();
27         },
28
29         // Save the old toggle function
30         _toggle: jQuery.fn.toggle,
31         
32         toggle: function( fn, fn2 ){
33                 return jQuery.isFunction(fn) && jQuery.isFunction(fn2) ?
34                         this._toggle( fn, fn2 ) :
35                         fn ?
36                                 this.animate({
37                                         height: "toggle", width: "toggle", opacity: "toggle"
38                                 }, fn, fn2) :
39                                 this.each(function(){
40                                         jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ]();
41                                 });
42         },
43         
44         slideDown: function(speed,callback){
45                 return this.animate({height: "show"}, speed, callback);
46         },
47         
48         slideUp: function(speed,callback){
49                 return this.animate({height: "hide"}, speed, callback);
50         },
51
52         slideToggle: function(speed, callback){
53                 return this.animate({height: "toggle"}, speed, callback);
54         },
55         
56         fadeIn: function(speed, callback){
57                 return this.animate({opacity: "show"}, speed, callback);
58         },
59         
60         fadeOut: function(speed, callback){
61                 return this.animate({opacity: "hide"}, speed, callback);
62         },
63         
64         fadeTo: function(speed,to,callback){
65                 return this.animate({opacity: to}, speed, callback);
66         },
67         
68         animate: function( prop, speed, easing, callback ) {
69                 var opt = jQuery.speed(speed, easing, callback);
70
71                 return this[ opt.queue === false ? "each" : "queue" ](function(){
72                         opt = jQuery.extend({}, opt);
73                         var hidden = jQuery(this).is(":hidden"), self = this;
74                         
75                         for ( var p in prop ) {
76                                 if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
77                                         return jQuery.isFunction(opt.complete) && opt.complete.apply(this);
78
79                                 if ( p == "height" || p == "width" ) {
80                                         // Store display property
81                                         opt.display = jQuery.css(this, "display");
82
83                                         // Make sure that nothing sneaks out
84                                         opt.overflow = this.style.overflow;
85                                 }
86                         }
87
88                         if ( opt.overflow != null )
89                                 this.style.overflow = "hidden";
90
91                         opt.curAnim = jQuery.extend({}, prop);
92                         
93                         jQuery.each( prop, function(name, val){
94                                 var e = new jQuery.fx( self, opt, name );
95
96                                 if ( /toggle|show|hide/.test(val) )
97                                         e[ val == "toggle" ? hidden ? "show" : "hide" : val ]( prop );
98                                 else {
99                                         var parts = val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),
100                                                 start = e.cur(true) || 0;
101
102                                         if ( parts ) {
103                                                 var end = parseFloat(parts[2]),
104                                                         unit = parts[3] || "px";
105
106                                                 // We need to compute starting value
107                                                 if ( unit != "px" ) {
108                                                         self.style[ name ] = end + unit;
109                                                         start = (end / e.cur(true)) * start;
110                                                         self.style[ name ] = start + unit;
111                                                 }
112
113                                                 // If a +=/-= token was provided, we're doing a relative animation
114                                                 if ( parts[1] )
115                                                         end = ((parts[1] == "-=" ? -1 : 1) * end) + start;
116
117                                                 e.custom( start, end, unit );
118                                         } else
119                                                 e.custom( start, val, "" );
120                                 }
121                         });
122
123                         // For JS strict compliance
124                         return true;
125                 });
126         },
127         
128         queue: function(type, fn){
129                 if ( jQuery.isFunction(type) ) {
130                         fn = type;
131                         type = "fx";
132                 }
133
134                 if ( !type || (typeof type == "string" && !fn) )
135                         return queue( this[0], type );
136
137                 return this.each(function(){
138                         if ( fn.constructor == Array )
139                                 queue(this, type, fn);
140                         else {
141                                 queue(this, type).push( fn );
142                         
143                                 if ( queue(this, type).length == 1 )
144                                         fn.apply(this);
145                         }
146                 });
147         },
148
149         stop: function(){
150                 var timers = jQuery.timers;
151
152                 return this.each(function(){
153                         for ( var i = 0; i < timers.length; i++ )
154                                 if ( timers[i].elem == this )
155                                         timers.splice(i--, 1);
156                 }).dequeue();
157         }
158
159 });
160
161 var queue = function( elem, type, array ) {
162         if ( !elem )
163                 return;
164
165         var q = jQuery.data( elem, type + "queue" );
166
167         if ( !q || array )
168                 q = jQuery.data( elem, type + "queue", 
169                         array ? jQuery.makeArray(array) : [] );
170
171         return q;
172 };
173
174 jQuery.fn.dequeue = function(type){
175         type = type || "fx";
176
177         return this.each(function(){
178                 var q = queue(this, type);
179
180                 q.shift();
181
182                 if ( q.length )
183                         q[0].apply( this );
184         });
185 };
186
187 jQuery.extend({
188         
189         speed: function(speed, easing, fn) {
190                 var opt = speed && speed.constructor == Object ? speed : {
191                         complete: fn || !fn && easing || 
192                                 jQuery.isFunction( speed ) && speed,
193                         duration: speed,
194                         easing: fn && easing || easing && easing.constructor != Function && easing
195                 };
196
197                 opt.duration = (opt.duration && opt.duration.constructor == Number ? 
198                         opt.duration : 
199                         { slow: 600, fast: 200 }[opt.duration]) || 400;
200         
201                 // Queueing
202                 opt.old = opt.complete;
203                 opt.complete = function(){
204                         jQuery(this).dequeue();
205                         if ( jQuery.isFunction( opt.old ) )
206                                 opt.old.apply( this );
207                 };
208         
209                 return opt;
210         },
211         
212         easing: {
213                 linear: function( p, n, firstNum, diff ) {
214                         return firstNum + diff * p;
215                 },
216                 swing: function( p, n, firstNum, diff ) {
217                         return ((-Math.cos(p*Math.PI)/2) + 0.5) * diff + firstNum;
218                 }
219         },
220         
221         timers: [],
222
223         fx: function( elem, options, prop ){
224                 this.options = options;
225                 this.elem = elem;
226                 this.prop = prop;
227
228                 if ( !options.orig )
229                         options.orig = {};
230         }
231
232 });
233
234 jQuery.fx.prototype = {
235
236         // Simple function for setting a style value
237         update: function(){
238                 if ( this.options.step )
239                         this.options.step.apply( this.elem, [ this.now, this ] );
240
241                 (jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this );
242
243                 // Set display property to block for height/width animations
244                 if ( this.prop == "height" || this.prop == "width" )
245                         this.elem.style.display = "block";
246         },
247
248         // Get the current size
249         cur: function(force){
250                 if ( this.elem[this.prop] != null && this.elem.style[this.prop] == null )
251                         return this.elem[ this.prop ];
252
253                 var r = parseFloat(jQuery.curCSS(this.elem, this.prop, force));
254                 return r && r > -10000 ? r : parseFloat(jQuery.css(this.elem, this.prop)) || 0;
255         },
256
257         // Start an animation from one number to another
258         custom: function(from, to, unit){
259                 this.startTime = (new Date()).getTime();
260                 this.start = from;
261                 this.end = to;
262                 this.unit = unit || this.unit || "px";
263                 this.now = this.start;
264                 this.pos = this.state = 0;
265                 this.update();
266
267                 var self = this;
268                 function t(){
269                         return self.step();
270                 }
271
272                 t.elem = this.elem;
273
274                 jQuery.timers.push(t);
275
276                 if ( jQuery.timers.length == 1 ) {
277                         var timer = setInterval(function(){
278                                 var timers = jQuery.timers;
279                                 
280                                 for ( var i = 0; i < timers.length; i++ )
281                                         if ( !timers[i]() )
282                                                 timers.splice(i--, 1);
283
284                                 if ( !timers.length )
285                                         clearInterval( timer );
286                         }, 13);
287                 }
288         },
289
290         // Simple 'show' function
291         show: function(){
292                 // Remember where we started, so that we can go back to it later
293                 this.options.orig[this.prop] = jQuery.attr( this.elem.style, this.prop );
294                 this.options.show = true;
295
296                 // Begin the animation
297                 this.custom(0, this.cur());
298
299                 // Make sure that we start at a small width/height to avoid any
300                 // flash of content
301                 if ( this.prop == "width" || this.prop == "height" )
302                         this.elem.style[this.prop] = "1px";
303                 
304                 // Start by showing the element
305                 jQuery(this.elem).show();
306         },
307
308         // Simple 'hide' function
309         hide: function(){
310                 // Remember where we started, so that we can go back to it later
311                 this.options.orig[this.prop] = jQuery.attr( this.elem.style, this.prop );
312                 this.options.hide = true;
313
314                 // Begin the animation
315                 this.custom(this.cur(), 0);
316         },
317
318         // Each step of an animation
319         step: function(){
320                 var t = (new Date()).getTime();
321
322                 if ( t > this.options.duration + this.startTime ) {
323                         this.now = this.end;
324                         this.pos = this.state = 1;
325                         this.update();
326
327                         this.options.curAnim[ this.prop ] = true;
328
329                         var done = true;
330                         for ( var i in this.options.curAnim )
331                                 if ( this.options.curAnim[i] !== true )
332                                         done = false;
333
334                         if ( done ) {
335                                 if ( this.options.display != null ) {
336                                         // Reset the overflow
337                                         this.elem.style.overflow = this.options.overflow;
338                                 
339                                         // Reset the display
340                                         this.elem.style.display = this.options.display;
341                                         if ( jQuery.css(this.elem, "display") == "none" )
342                                                 this.elem.style.display = "block";
343                                 }
344
345                                 // Hide the element if the "hide" operation was done
346                                 if ( this.options.hide )
347                                         this.elem.style.display = "none";
348
349                                 // Reset the properties, if the item has been hidden or shown
350                                 if ( this.options.hide || this.options.show )
351                                         for ( var p in this.options.curAnim )
352                                                 jQuery.attr(this.elem.style, p, this.options.orig[p]);
353                         }
354
355                         // If a callback was provided, execute it
356                         if ( done && jQuery.isFunction( this.options.complete ) )
357                                 // Execute the complete function
358                                 this.options.complete.apply( this.elem );
359
360                         return false;
361                 } else {
362                         var n = t - this.startTime;
363                         this.state = n / this.options.duration;
364
365                         // Perform the easing function, defaults to swing
366                         this.pos = jQuery.easing[this.options.easing || (jQuery.easing.swing ? "swing" : "linear")](this.state, n, 0, 1, this.options.duration);
367                         this.now = this.start + ((this.end - this.start) * this.pos);
368
369                         // Perform the next step of the animation
370                         this.update();
371                 }
372
373                 return true;
374         }
375
376 };
377
378 jQuery.fx.step = {
379         scrollLeft: function(fx){
380                 fx.elem.scrollLeft = fx.now;
381         },
382
383         scrollTop: function(fx){
384                 fx.elem.scrollTop = fx.now;
385         },
386
387         opacity: function(fx){
388                 jQuery.attr(fx.elem.style, "opacity", fx.now);
389         },
390
391         _default: function(fx){
392                 fx.elem.style[ fx.prop ] = fx.now + fx.unit;
393         }
394 };