mirror of
https://github.com/jquery/jquery-ui.git
synced 2024-11-21 11:04:24 +00:00
effects.*: style guidance
This commit is contained in:
parent
9c771b8f8b
commit
576cd0b92b
21
ui/jquery.effects.blind.js
vendored
21
ui/jquery.effects.blind.js
vendored
@ -15,6 +15,7 @@
|
||||
$.effects.blind = function( o ) {
|
||||
|
||||
return this.queue( function() {
|
||||
|
||||
// Create element
|
||||
var el = $( this ),
|
||||
props = [ 'position', 'top', 'bottom', 'left', 'right' ],
|
||||
@ -24,19 +25,23 @@ $.effects.blind = function(o) {
|
||||
animation = {},
|
||||
wrapper, distance;
|
||||
|
||||
// Adjust
|
||||
$.effects.save(el, props); el.show(); // Save & Show
|
||||
|
||||
wrapper = $.effects.createWrapper(el).css({overflow:'hidden'}); // Create Wrapper
|
||||
$.effects.save( el, props );
|
||||
el.show();
|
||||
wrapper = $.effects.createWrapper( el ).css({
|
||||
overflow: 'hidden'
|
||||
});
|
||||
|
||||
animation[ ref ] = ( mode == 'show' ? wrapper[ ref ]() : 0 );
|
||||
(mode == 'show' && wrapper.css(ref, 0)); // start at 0 if we are showing
|
||||
|
||||
// start at 0 if we are showing
|
||||
( mode == 'show' && wrapper.css( ref, 0 ) );
|
||||
|
||||
// Animate
|
||||
wrapper.animate( animation, o.duration, o.easing, function() {
|
||||
(mode == 'hide' && el.hide()); // Hide
|
||||
$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
|
||||
(o.complete && o.complete.apply(el[0], arguments)); // Callback
|
||||
( mode == 'hide' && el.hide() );
|
||||
$.effects.restore( el, props );
|
||||
$.effects.removeWrapper( el );
|
||||
$.isFunction( o.complete ) && o.complete.apply( el[ 0 ], arguments );
|
||||
el.dequeue();
|
||||
});
|
||||
|
||||
|
52
ui/jquery.effects.bounce.js
vendored
52
ui/jquery.effects.bounce.js
vendored
@ -30,12 +30,15 @@ $.effects.bounce = function(o) {
|
||||
// utility:
|
||||
ref = ( direction == 'up' || direction == 'down' ) ? 'top' : 'left',
|
||||
motion = ( direction == 'up' || direction == 'left' ), // true is positive
|
||||
distance = o.distance || false;
|
||||
i, animation, animation1, animation2;
|
||||
|
||||
// Avoid touching opacity to prevent clearType and PNG issues in IE
|
||||
if ( rshowhide.test(mode) ) props.push('opacity');
|
||||
if ( rshowhide.test( mode ) ) {
|
||||
props.push( 'opacity' );
|
||||
}
|
||||
|
||||
$.effects.save(el, props); el.show(); // Save & Show
|
||||
$.effects.save( el, props );
|
||||
el.show();
|
||||
$.effects.createWrapper( el ); // Create Wrapper
|
||||
|
||||
if ( !distance ) {
|
||||
@ -46,38 +49,51 @@ $.effects.bounce = function(o) {
|
||||
if ( mode != 'hide' ) times--;
|
||||
|
||||
// Animate
|
||||
if (mode == 'show') { // Show Bounce
|
||||
var animation = { opacity: 1 };
|
||||
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 = {};
|
||||
|
||||
// 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
|
||||
};
|
||||
if (mode == 'hide') { // Last Bounce
|
||||
var animation = { opacity: 0 };
|
||||
animation[ ref ] = ( motion ? '-=' : '+=' ) + distance;
|
||||
el.animate( animation, speed / 2, o.easing, function(){
|
||||
el.hide(); // Hide
|
||||
$.effects.restore( el, props ); $.effects.removeWrapper( el ); // Restore
|
||||
if ( o.complete ) o.complete.apply( this, arguments ); // Callback
|
||||
el.hide();
|
||||
$.effects.restore( el, props );
|
||||
$.effects.removeWrapper( el );
|
||||
$.isFunction( o.complete ) && o.complete.apply( this, arguments );
|
||||
});
|
||||
} else {
|
||||
var animation1 = {}, animation2 = {};
|
||||
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); // Restore
|
||||
if(o.complete) o.complete.apply(this, arguments); // Callback
|
||||
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.queue('fx', function(next) { next(); });
|
||||
}
|
||||
el.dequeue();
|
||||
});
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user