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

Effects: General Code Cleanup

Browse Source
This commit is contained in:
gnarf 2011-03-04 17:10:02 -06:00
parent 5c4577f78c
commit 2fdc868707
2 changed files with 41 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ui/jquery.effects.blind.js vendored
View File

@ -15,30 +15,28 @@
$.effects.blind = function(o) { $.effects.blind = function(o) {
return this.queue(function() { return this.queue(function() {
// Create element // Create element
var el = $(this), var el = $(this),
props = ['position','top','bottom','left','right'], props = ['position','top','bottom','left','right'],
mode = $.effects.setMode( el, o.mode || 'hide' ), mode = $.effects.setMode( el, o.mode || 'hide' ),
direction = o.direction || 'vertical', direction = o.direction || 'vertical',
ref = (direction == 'vertical') ? 'height' : 'width', ref = (direction == 'vertical') ? 'height' : 'width',
wrapper, distance; // Default direction animation = {},
wrapper, distance;
// Adjust // Adjust
$.effects.save(el, props); el.show(); // Save & Show $.effects.save(el, props); el.show(); // Save & Show
wrapper = $.effects.createWrapper(el).css({overflow:'hidden'}); // Create Wrapper
distance = wrapper[ direction == 'vertical' ? "height" : "width" ]();
if(mode == 'show') wrapper.css(ref, 0); // Shift
// Animation wrapper = $.effects.createWrapper(el).css({overflow:'hidden'}); // Create Wrapper
var animation = {};
animation[ref] = mode == 'show' ? distance : 0; animation[ref] = ( mode == 'show' ? wrapper[ ref ]() : 0 );
(mode == 'show' && wrapper.css(ref, 0)); // start at 0 if we are showing
// Animate // Animate
wrapper.animate( animation, o.duration, o.easing, function() { wrapper.animate( animation, o.duration, o.easing, function() {
if(mode == 'hide') el.hide(); // Hide (mode == 'hide' && el.hide()); // Hide
$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore $.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
if(o.complete) o.complete.apply(el[0], arguments); // Callback (o.complete && o.complete.apply(el[0], arguments)); // Callback
el.dequeue(); el.dequeue();
}); });

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

@ -12,6 +12,8 @@
*/ */
(function( $, undefined ) { (function( $, undefined ) {
var rshowhide = /show|hide/;
$.effects.bounce = function(o) { $.effects.bounce = function(o) {
return this.queue(function() { return this.queue(function() {
@ -19,41 +21,48 @@ $.effects.bounce = function(o) {
// Create element // Create element
var el = $( this ), var el = $( this ),
props = [ 'position', 'top', 'bottom', 'left', 'right' ], props = [ 'position', 'top', 'bottom', 'left', 'right' ],
// defaults:
mode = $.effects.setMode( el, o.mode || 'effect' ), mode = $.effects.setMode( el, o.mode || 'effect' ),
direction = o.direction || 'up', // Default direction direction = o.direction || 'up',
distance = o.distance || 20, // Default distance distance = o.distance || 20,
times = o.times || 5, // Default # of times times = o.times || 5,
speed = o.duration || 250; // Default speed per bounce speed = (o.duration || 250),
if (/show|hide/.test(mode)) props.push('opacity'); // Avoid touching opacity to prevent clearType and PNG issues in IE // utility:
ref = ( direction == 'up' || direction == 'down' ) ? 'top' : 'left',
motion = ( direction == 'up' || direction == 'left' ), // true is positive
distance = o.distance || false;
// Avoid touching opacity to prevent clearType and PNG issues in IE
if ( rshowhide.test(mode) ) props.push('opacity');
// Adjust
$.effects.save(el, props); el.show(); // Save & Show $.effects.save(el, props); el.show(); // Save & Show
$.effects.createWrapper(el); // Create Wrapper $.effects.createWrapper(el); // Create Wrapper
var ref = (direction == 'up' || direction == 'down') ? 'top' : 'left';
var motion = (direction == 'up' || direction == 'left') ? 'pos' : 'neg'; if ( !distance ) {
var distance = o.distance || (ref == 'top' ? el.outerHeight({margin:true}) / 3 : el.outerWidth({margin:true}) / 3); distance = el[ref == 'top' ? 'outerHeight' : 'outerWidth' ]( { margin:true } ) / 3;
if (mode == 'show') el.css('opacity', 0).css(ref, motion == 'pos' ? -distance : distance); // Shift }
if (mode == 'show') el.css('opacity', 0).css(ref, motion ? -distance : distance ); // Shift
if (mode == 'hide') distance = distance / (times * 2); if (mode == 'hide') distance = distance / (times * 2);
if (mode != 'hide') times--; if (mode != 'hide') times--;
// Animate // Animate
if (mode == 'show') { // Show Bounce if (mode == 'show') { // Show Bounce
var animation = { opacity: 1 }; var animation = { opacity: 1 };
animation[ref] = (motion == 'pos' ? '+=' : '-=') + distance; animation[ref] = (motion ? '+=' : '-=') + distance;
el.animate( animation, speed / 2, o.easing); el.animate( animation, speed / 2, o.easing);
distance = distance / 2; distance = distance / 2;
times--; times--;
}; };
for (var i = 0; i < times; i++) { // Bounces for (var i = 0; i < times; i++) { // Bounces
var animation1 = {}, animation2 = {}; var animation1 = {}, animation2 = {};
animation1[ref] = (motion == 'pos' ? '-=' : '+=') + distance; animation1[ref] = (motion ? '-=' : '+=') + distance;
animation2[ref] = (motion == 'pos' ? '+=' : '-=') + distance; animation2[ref] = (motion ? '+=' : '-=') + distance;
el.animate( animation1, speed / 2, o.easing ).animate( animation2, speed / 2, o.easing ); el.animate( animation1, speed / 2, o.easing ).animate( animation2, speed / 2, o.easing );
distance = (mode == 'hide') ? distance * 2 : distance / 2; distance = (mode == 'hide') ? distance * 2 : distance / 2;
}; };
if (mode == 'hide') { // Last Bounce if (mode == 'hide') { // Last Bounce
var animation = { opacity: 0 }; var animation = { opacity: 0 };
animation[ref] = (motion == 'pos' ? '-=' : '+=') + distance; animation[ref] = (motion ? '-=' : '+=') + distance;
el.animate( animation, speed / 2, o.easing, function(){ el.animate( animation, speed / 2, o.easing, function(){
el.hide(); // Hide el.hide(); // Hide
$.effects.restore( el, props ); $.effects.removeWrapper( el ); // Restore $.effects.restore( el, props ); $.effects.removeWrapper( el ); // Restore
@ -61,14 +70,14 @@ $.effects.bounce = function(o) {
}); });
} else { } else {
var animation1 = {}, animation2 = {}; var animation1 = {}, animation2 = {};
animation1[ref] = (motion == 'pos' ? '-=' : '+=') + distance; animation1[ref] = (motion ? '-=' : '+=') + distance;
animation2[ref] = (motion == 'pos' ? '+=' : '-=') + distance; animation2[ref] = (motion ? '+=' : '-=') + distance;
el.animate(animation1, speed / 2, o.easing).animate(animation2, speed / 2, o.easing, function(){ el.animate(animation1, speed / 2, o.easing).animate(animation2, speed / 2, o.easing, function(){
$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore $.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
if(o.complete) o.complete.apply(this, arguments); // Callback if(o.complete) o.complete.apply(this, arguments); // Callback
}); });
}; };
el.queue('fx', function() { el.dequeue(); }); el.queue('fx', function(next) { next(); });
el.dequeue(); el.dequeue();
}); });