aboutsummaryrefslogtreecommitdiffstats
path: root/ui/jquery.effects.bounce.js
diff options
context:
space:
mode:
Diffstat (limited to 'ui/jquery.effects.bounce.js')
-rw-r--r--ui/jquery.effects.bounce.js112
1 files changed, 68 insertions, 44 deletions
diff --git a/ui/jquery.effects.bounce.js b/ui/jquery.effects.bounce.js
index 055b47596..d5b43492e 100644
--- a/ui/jquery.effects.bounce.js
+++ b/ui/jquery.effects.bounce.js
@@ -12,64 +12,88 @@
*/
(function( $, undefined ) {
+var rshowhide = /show|hide/;
+
$.effects.bounce = function(o) {
return this.queue(function() {
// Create element
- var el = $(this), props = ['position','top','bottom','left','right'];
+ var el = $( this ),
+ props = [ 'position', 'top', 'bottom', 'left', 'right' ],
+ // defaults:
+ mode = $.effects.setMode( el, o.mode || 'effect' ),
+ direction = o.direction || 'up',
+ distance = o.distance || 20,
+ times = o.times || 5,
+ speed = (o.duration || 250),
+ // utility:
+ ref = ( direction == 'up' || direction == 'down' ) ? 'top' : 'left',
+ motion = ( direction == 'up' || direction == 'left' ), // true is positive
+ i, animation, animation1, animation2;
+
+ // Avoid touching opacity to prevent clearType and PNG issues in IE
+ if ( rshowhide.test( mode ) ) {
+ props.push( 'opacity' );
+ }
- // Set options
- var mode = $.effects.setMode(el, o.options.mode || 'effect'); // Set Mode
- var direction = o.options.direction || 'up'; // Default direction
- var distance = o.options.distance || 20; // Default distance
- var times = o.options.times || 5; // Default # of times
- var speed = o.duration || 250; // Default speed per bounce
- if (/show|hide/.test(mode)) props.push('opacity'); // Avoid touching opacity to prevent clearType and PNG issues in IE
+ $.effects.save( el, props );
+ el.show();
+ $.effects.createWrapper( el ); // Create Wrapper
- // Adjust
- $.effects.save(el, props); el.show(); // Save & Show
- $.effects.createWrapper(el); // Create Wrapper
- var ref = (direction == 'up' || direction == 'down') ? 'top' : 'left';
- var motion = (direction == 'up' || direction == 'left') ? 'pos' : 'neg';
- var distance = o.options.distance || (ref == 'top' ? el.outerHeight({margin:true}) / 3 : el.outerWidth({margin:true}) / 3);
- if (mode == 'show') el.css('opacity', 0).css(ref, motion == 'pos' ? -distance : distance); // Shift
- if (mode == 'hide') distance = distance / (times * 2);
- if (mode != 'hide') times--;
+ if ( !distance ) {
+ distance = el[ ref == 'top' ? 'outerHeight' : 'outerWidth' ]({ margin:true }) / 3;
+ }
+ if ( mode == 'show' ) el.css( 'opacity', 0 ).css( ref, motion ? -distance : distance ); // Shift
+ if ( mode == 'hide' ) distance = distance / (times * 2);
+ if ( mode != 'hide' ) times--;
// Animate
- if (mode == 'show') { // Show Bounce
- var animation = {opacity: 1};
- animation[ref] = (motion == 'pos' ? '+=' : '-=') + distance;
- el.animate(animation, speed / 2, o.options.easing);
+ if ( mode == 'show' ) {
+ animation = {
+ opacity: 1
+ };
+ animation[ ref ] = ( motion ? '+=' : '-=' ) + distance;
+ el.animate( animation, speed / 2, o.easing);
distance = distance / 2;
times--;
};
- for (var i = 0; i < times; i++) { // Bounces
- var animation1 = {}, animation2 = {};
- animation1[ref] = (motion == 'pos' ? '-=' : '+=') + distance;
- animation2[ref] = (motion == 'pos' ? '+=' : '-=') + distance;
- el.animate(animation1, speed / 2, o.options.easing).animate(animation2, speed / 2, o.options.easing);
- distance = (mode == 'hide') ? distance * 2 : distance / 2;
- };
- if (mode == 'hide') { // Last Bounce
- var animation = {opacity: 0};
- animation[ref] = (motion == 'pos' ? '-=' : '+=') + distance;
- el.animate(animation, speed / 2, o.options.easing, function(){
- el.hide(); // Hide
- $.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
- if(o.callback) o.callback.apply(this, arguments); // Callback
+
+ // Bounces
+ for (i = 0; i < times; i++) {
+ animation1 = {};
+ animation2 = {};
+ animation1[ ref ] = ( motion ? '-=' : '+=' ) + distance;
+ animation2[ ref ] = ( motion ? '+=' : '-=' ) + distance;
+ el.animate( animation1, speed / 2, o.easing ).animate( animation2, speed / 2, o.easing );
+ distance = ( mode == 'hide' ) ? distance * 2 : distance / 2;
+ }
+
+ // Last Bounce
+ if ( mode == 'hide' ) {
+ animation = {
+ opacity: 0
+ };
+ animation[ ref ] = ( motion ? '-=' : '+=' ) + distance;
+ el.animate( animation, speed / 2, o.easing, function(){
+ el.hide();
+ $.effects.restore( el, props );
+ $.effects.removeWrapper( el );
+ $.isFunction( o.complete ) && o.complete.apply( this, arguments );
});
} else {
- var animation1 = {}, animation2 = {};
- animation1[ref] = (motion == 'pos' ? '-=' : '+=') + distance;
- animation2[ref] = (motion == 'pos' ? '+=' : '-=') + distance;
- el.animate(animation1, speed / 2, o.options.easing).animate(animation2, speed / 2, o.options.easing, function(){
- $.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
- if(o.callback) o.callback.apply(this, arguments); // Callback
- });
- };
- el.queue('fx', function() { el.dequeue(); });
+ animation1 = {};
+ animation2 = {};
+ animation1[ ref ] = ( motion ? '-=' : '+=' ) + distance;
+ animation2[ ref ] = ( motion ? '+=' : '-=' ) + distance;
+ el
+ .animate( animation1, speed / 2, o.easing )
+ .animate( animation2, speed / 2, o.easing, function() {
+ $.effects.restore( el, props );
+ $.effects.removeWrapper( el );
+ $.isFunction( o.complete ) && o.complete.apply( this, arguments );
+ });
+ }
el.dequeue();
});