library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2024-11-21 11:04:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some minor tweaks to the effects, trying to clean up code a bit + style guidance

Browse Source
This commit is contained in:
gnarf 2011-05-01 03:44:33 -05:00
parent cc2342ac31
commit 321fd39057
2 changed files with 63 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
ui/jquery.effects.bounce.js vendored
View File

@ -12,30 +12,28 @@
*/ */
(function( $, undefined ) { (function( $, undefined ) {
var rshowhide = /show|hide/;
$.effects.effect.bounce = function(o) { $.effects.effect.bounce = function(o) {
return this.queue(function() { return this.queue( function( next ) {
// Create element
var el = $( this ), var el = $( this ),
props = [ 'position', 'top', 'bottom', 'left', 'right' ], props = [ "position", "top", "bottom", "left", "right" ],
// defaults: // defaults:
mode = $.effects.setMode( el, o.mode || 'effect' ), mode = $.effects.setMode( el, o.mode || "effect" ),
showhide = rshowhide.test( mode ), hide = mode === "hide",
direction = o.direction || 'up', show = mode === "show",
direction = o.direction || "up",
distance = o.distance || 20, distance = o.distance || 20,
times = o.times || 5, times = o.times || 5,
// number of internal animations // number of internal animations
anims = times * 2 + showhide, anims = times * 2 + ( show || hide ? 1 : 0 ),
speed = o.duration / anims, speed = o.duration / anims,
easing = o.easing, easing = o.easing,
// utility: // utility:
ref = ( direction == 'up' || direction == 'down' ) ? 'top' : 'left', ref = ( direction === "up" || direction === "down" ) ? "top" : "left",
motion = ( direction == 'up' || direction == 'left' ), // true is positive motion = ( direction === "up" || direction === "left" ),
i, i,
upAnim, upAnim,
downAnim, downAnim,
@ -45,8 +43,8 @@ $.effects.effect.bounce = function(o) {
queuelen = queue.length; queuelen = queue.length;
// Avoid touching opacity to prevent clearType and PNG issues in IE // Avoid touching opacity to prevent clearType and PNG issues in IE
if ( showhide ) { if ( show || hide ) {
props.push( 'opacity' ); props.push( "opacity" );
} }
$.effects.save( el, props ); $.effects.save( el, props );
@ -55,41 +53,44 @@ $.effects.effect.bounce = function(o) {
// default distance for the BIGGEST bounce is the outer Distance / 3 // default distance for the BIGGEST bounce is the outer Distance / 3
if ( !distance ) { if ( !distance ) {
distance = el[ ref == 'top' ? 'outerHeight' : 'outerWidth' ]({ margin:true }) / 3; distance = el[ ref === "top" ? "outerHeight" : "outerWidth" ]({ margin:true }) / 3;
} }
if ( mode == 'show' ) { if ( show ) {
upAnim = { opacity: 1 }; downAnim = { opacity: 1 };
upAnim[ ref ] = 0; downAnim[ ref ] = 0;
// fade and set the initial position if we are showing // if we are showing, force opacity 0 and set the initial position
el.css( 'opacity', 0 ) // then do the "first" animation
el.css( "opacity", 0 )
.css( ref, motion ? -distance*2 : distance*2 ) .css( ref, motion ? -distance*2 : distance*2 )
.animate( upAnim, speed, easing ); .animate( downAnim, speed, easing );
} }
// start at the smallest distance if we are hiding // start at the smallest distance if we are hiding
if ( mode == 'hide' ) { if ( hide ) {
distance = distance / ( ( times - 1 ) * 2 ); distance = distance / ( ( times - 1 ) * 2 );
} }
// Bounces up then down (or reversed if motion) -- times * 2 animations happen here downAnim = {};
downAnim[ ref ] = 0;
// Bounces up/down/left/right then back to 0 -- times * 2 animations happen here
for ( i = 0; i < times; i++ ) { for ( i = 0; i < times; i++ ) {
upAnim = {}; upAnim = {};
downAnim = {}; upAnim[ ref ] = ( motion ? "-=" : "+=" ) + distance;
upAnim[ ref ] = ( motion ? '-=' : '+=' ) + distance;
downAnim[ ref ] = ( motion ? '+=' : '-=' ) + distance; // add the finish callback to the last animation if we aren't hiding
el.animate( upAnim, speed, easing ) el.animate( upAnim, speed, easing )
.animate( downAnim, speed, easing, .animate( downAnim, speed, easing,
( i == times - 1 ) && ( mode != "hide" ) ? finish : undefined ); ( ( i === times - 1 ) && !hide ) ? finish : undefined );
distance = mode == 'hide' ? distance * 2 : distance / 2; distance = hide ? distance * 2 : distance / 2;
} }
// Last Bounce // Last Bounce when Hiding
if ( mode == 'hide' ) { if ( hide ) {
upAnim = { opacity: 0 }; upAnim = { opacity: 0 };
upAnim[ ref ] = ( motion ? '-=' : '+=' ) + distance; upAnim[ ref ] = ( motion ? "-=" : "+=" ) + distance;
el.animate( upAnim, speed, easing, function(){ el.animate( upAnim, speed, easing, function(){
el.hide(); el.hide();
@ -97,18 +98,21 @@ $.effects.effect.bounce = function(o) {
}); });
} }
function finish() {
$.effects.restore( el, props );
$.effects.removeWrapper( el );
if ( o.complete ) {
o.complete.apply( el[ 0 ] );
}
}
// inject all the animations we just queued to be first in line (after "inprogress") // inject all the animations we just queued to be first in line (after "inprogress")
if ( queuelen > 1) { if ( queuelen > 1) {
queue.splice.apply( queue, queue.splice.apply( queue,
[ 1, 0 ].concat( queue.splice( queuelen, anims ) ) ); [ 1, 0 ].concat( queue.splice( queuelen, anims ) ) );
} }
el.dequeue(); next();
function finish() {
$.effects.restore( el, props );
$.effects.removeWrapper( el );
$.isFunction( o.complete ) && o.complete.apply( el[ 0 ], arguments );
}
}); });
}; };

40
ui/jquery.effects.pulsate.js vendored
View File

@ -13,45 +13,49 @@
(function( $, undefined ) { (function( $, undefined ) {
$.effects.effect.pulsate = function( o ) { $.effects.effect.pulsate = function( o ) {
return this.queue( function() { return this.queue( function( next ) {
var elem = $( this ), var elem = $( this ),
mode = $.effects.setMode( elem, o.mode || 'show' ), mode = $.effects.setMode( elem, o.mode || "show" ),
show = mode === "show" || !elem.is( ":visible" ),
showhide = ( show || mode === "hide" ),
// showing or hiding leave of the "last" time // showing or hiding leaves of the "last" animation
times = ( ( o.times || 5 ) * 2 ) - ( mode == "show" || mode == "hide" ), anims = ( ( o.times || 5 ) * 2 ) - ( showhide ? 1 : 0 ),
duration = o.duration / times, duration = o.duration / anims,
show = !elem.is( ":visible" ),
animateTo = 0, animateTo = 0,
i,
queue = elem.queue(), queue = elem.queue(),
queuelen = queue.length; queuelen = queue.length,
i;
if ( show ) { if ( show ) {
elem.css('opacity', 0).show(); elem.css( "opacity", 0 ).show();
animateTo = 1; animateTo = 1;
} }
for ( i = 0; i < times - 1; i++ ) { for ( i = 0; i < anims - 1; i++ ) {
elem.animate({ elem.animate({
opacity: animateTo opacity: animateTo
}, duration, o.easing ); }, duration, o.easing );
animateTo = 1 - animateTo; animateTo = 1 - animateTo;
} }
elem.animate({ elem.animate({
opacity: animateTo opacity: animateTo
}, duration, o.easing, function() { }, duration, o.easing, function() {
if (animateTo == 0) { if ( animateTo === 0 ) {
elem.hide(); elem.hide();
} }
(o.complete && o.complete.apply(this, arguments)); if ( o.complete ) {
o.complete.apply( this );
}
}); });
// We just queued up "anims" animations, we need to put them next in the queue
if ( queuelen > 1) { if ( queuelen > 1) {
queue.splice.apply( queue, queue.splice.apply( queue,
[ 1, 0 ].concat( queue.splice( queuelen, times ) ) ); [ 1, 0 ].concat( queue.splice( queuelen, anims ) ) );
} }
elem.dequeue(); next();
}); });
}; };