From a370d1ffc8b0783a3a9ed1951e144902baddb264 Mon Sep 17 00:00:00 2001 From: gnarf Date: Wed, 2 Mar 2011 20:00:57 -0600 Subject: Just a quick touch to update to new internal effects object API --- ui/jquery.effects.drop.js | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'ui/jquery.effects.drop.js') diff --git a/ui/jquery.effects.drop.js b/ui/jquery.effects.drop.js index f13dda856..152da6b54 100644 --- a/ui/jquery.effects.drop.js +++ b/ui/jquery.effects.drop.js @@ -17,18 +17,17 @@ $.effects.drop = function(o) { return this.queue(function() { // Create element - var el = $(this), props = ['position','top','bottom','left','right','opacity']; - - // Set options - var mode = $.effects.setMode(el, o.options.mode || 'hide'); // Set Mode - var direction = o.options.direction || 'left'; // Default Direction + var el = $( this ), + props = ['position','top','bottom','left','right','opacity'], + mode = $.effects.setMode(el, o.mode || 'hide'), + direction = o.direction || 'left'; // Default Direction // 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}) / 2 : el.outerWidth({margin:true}) / 2); + var distance = o.distance || (ref == 'top' ? el.outerHeight({margin:true}) / 2 : el.outerWidth({margin:true}) / 2); if (mode == 'show') el.css('opacity', 0).css(ref, motion == 'pos' ? -distance : distance); // Shift // Animation @@ -36,10 +35,10 @@ $.effects.drop = function(o) { animation[ref] = (mode == 'show' ? (motion == 'pos' ? '+=' : '-=') : (motion == 'pos' ? '-=' : '+=')) + distance; // Animate - el.animate(animation, { queue: false, duration: o.duration, easing: o.options.easing, complete: function() { + el.animate(animation, { queue: false, duration: o.duration, easing: o.easing, complete: function() { if(mode == 'hide') el.hide(); // Hide $.effects.restore(el, props); $.effects.removeWrapper(el); // Restore - if(o.callback) o.callback.apply(this, arguments); // Callback + if(o.complete) o.complete.apply(this, arguments); // Callback el.dequeue(); }}); -- cgit v1.2.3 From 61cf83408136514282523179e4ce93d3b88638da Mon Sep 17 00:00:00 2001 From: gnarf Date: Sun, 6 Mar 2011 05:36:06 -0600 Subject: effects.drop: Style Guidance --- ui/jquery.effects.drop.js | 56 +++++++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 21 deletions(-) (limited to 'ui/jquery.effects.drop.js') diff --git a/ui/jquery.effects.drop.js b/ui/jquery.effects.drop.js index 152da6b54..e13690746 100644 --- a/ui/jquery.effects.drop.js +++ b/ui/jquery.effects.drop.js @@ -12,35 +12,49 @@ */ (function( $, undefined ) { -$.effects.drop = function(o) { +$.effects.drop = function( o ) { - return this.queue(function() { + return this.queue( function() { - // Create element var el = $( this ), - props = ['position','top','bottom','left','right','opacity'], - mode = $.effects.setMode(el, o.mode || 'hide'), - direction = o.direction || 'left'; // Default Direction - + props = [ 'position', 'top', 'bottom', 'left', 'right', 'opacity' ], + mode = $.effects.setMode( el, o.mode || 'hide' ), + direction = o.direction || 'left', + ref = (direction == 'up' || direction == 'down') ? 'top' : 'left', + motion = (direction == 'up' || direction == 'left') ? 'pos' : 'neg', + animation = { + opacity: mode == 'show' ? 1 : 0 + }, + distance; + // 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.distance || (ref == 'top' ? el.outerHeight({margin:true}) / 2 : el.outerWidth({margin:true}) / 2); - if (mode == 'show') el.css('opacity', 0).css(ref, motion == 'pos' ? -distance : distance); // Shift + $.effects.save(el, props); el.show(); + $.effects.createWrapper(el); + + distance = o.distance || el[ ref == 'top' ? 'outerHeight': 'outerWidth' ]({ margin: true }) / 2; + + if ( mode == 'show' ) { + el + .css( 'opacity', 0 ) + .css( ref, motion == 'pos' ? -distance : distance ); + } // Animation - var animation = {opacity: mode == 'show' ? 1 : 0}; - animation[ref] = (mode == 'show' ? (motion == 'pos' ? '+=' : '-=') : (motion == 'pos' ? '-=' : '+=')) + distance; + animation[ ref ] = ((mode == 'show') ? (motion == 'pos' ? '+=' : '-=') : (motion == 'pos' ? '-=' : '+=')) + distance; // Animate - el.animate(animation, { queue: false, duration: o.duration, easing: o.easing, complete: function() { - if(mode == 'hide') el.hide(); // Hide - $.effects.restore(el, props); $.effects.removeWrapper(el); // Restore - if(o.complete) o.complete.apply(this, arguments); // Callback - el.dequeue(); - }}); + el.animate( animation, { + queue: false, + duration: o.duration, + easing: o.easing, + complete: function() { + mode == 'hide' && el.hide(); + $.effects.restore(el, props); + $.effects.removeWrapper(el); + $.isFunction( o.complete ) && o.complete.apply(this, arguments); + el.dequeue(); + } + }); }); -- cgit v1.2.3 From 576cd0b92b7469a1f8836dcd7c942083a4d1326d Mon Sep 17 00:00:00 2001 From: gnarf Date: Sun, 6 Mar 2011 18:48:14 -0600 Subject: effects.*: style guidance --- ui/jquery.effects.blind.js | 31 ++++++++++-------- ui/jquery.effects.bounce.js | 80 +++++++++++++++++++++++++++------------------ ui/jquery.effects.drop.js | 4 +-- 3 files changed, 68 insertions(+), 47 deletions(-) (limited to 'ui/jquery.effects.drop.js') diff --git a/ui/jquery.effects.blind.js b/ui/jquery.effects.blind.js index 814649a04..0c865d59f 100644 --- a/ui/jquery.effects.blind.js +++ b/ui/jquery.effects.blind.js @@ -12,31 +12,36 @@ */ (function( $, undefined ) { -$.effects.blind = function(o) { +$.effects.blind = function( o ) { + + return this.queue( function() { - return this.queue(function() { // Create element - var el = $( this ), - props = ['position','top','bottom','left','right'], + var el = $( this ), + props = [ 'position', 'top', 'bottom', 'left', 'right' ], mode = $.effects.setMode( el, o.mode || 'hide' ), direction = o.direction || 'vertical', ref = ( direction == 'vertical' ) ? 'height' : 'width', 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 ); - 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(); }); diff --git a/ui/jquery.effects.bounce.js b/ui/jquery.effects.bounce.js index dde99481b..d5b43492e 100644 --- a/ui/jquery.effects.bounce.js +++ b/ui/jquery.effects.bounce.js @@ -30,54 +30,70 @@ $.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.createWrapper(el); // Create Wrapper + $.effects.save( el, props ); + el.show(); + $.effects.createWrapper( el ); // Create Wrapper if ( !distance ) { - distance = el[ref == 'top' ? 'outerHeight' : 'outerWidth' ]( { margin:true } ) / 3; + 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--; + 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 ? '+=' : '-=') + distance; + 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 ? '-=' : '+=') + distance; - animation2[ref] = (motion ? '+=' : '-=') + distance; + + // 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; - }; - if (mode == 'hide') { // Last Bounce - var animation = { opacity: 0 }; - animation[ref] = (motion ? '-=' : '+=') + distance; + 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(); // 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[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.queue('fx', function(next) { next(); }); + 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(); }); diff --git a/ui/jquery.effects.drop.js b/ui/jquery.effects.drop.js index e13690746..221a0bf17 100644 --- a/ui/jquery.effects.drop.js +++ b/ui/jquery.effects.drop.js @@ -49,8 +49,8 @@ $.effects.drop = function( o ) { easing: o.easing, complete: function() { mode == 'hide' && el.hide(); - $.effects.restore(el, props); - $.effects.removeWrapper(el); + $.effects.restore( el, props ); + $.effects.removeWrapper( el ); $.isFunction( o.complete ) && o.complete.apply(this, arguments); el.dequeue(); } -- cgit v1.2.3 From b6debf4daf015173de904a361ddb1041fc9474a8 Mon Sep 17 00:00:00 2001 From: gnarf Date: Sun, 6 Mar 2011 23:34:24 -0600 Subject: effects.drop: Quick second pass Style Guidance --- ui/jquery.effects.drop.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'ui/jquery.effects.drop.js') diff --git a/ui/jquery.effects.drop.js b/ui/jquery.effects.drop.js index 221a0bf17..b88a8c428 100644 --- a/ui/jquery.effects.drop.js +++ b/ui/jquery.effects.drop.js @@ -20,17 +20,18 @@ $.effects.drop = function( o ) { props = [ 'position', 'top', 'bottom', 'left', 'right', 'opacity' ], mode = $.effects.setMode( el, o.mode || 'hide' ), direction = o.direction || 'left', - ref = (direction == 'up' || direction == 'down') ? 'top' : 'left', - motion = (direction == 'up' || direction == 'left') ? 'pos' : 'neg', + ref = ( direction == 'up' || direction == 'down' ) ? 'top' : 'left', + motion = ( direction == 'up' || direction == 'left' ) ? 'pos' : 'neg', animation = { opacity: mode == 'show' ? 1 : 0 }, distance; - + // Adjust - $.effects.save(el, props); el.show(); - $.effects.createWrapper(el); - + $.effects.save( el, props ); + el.show(); + $.effects.createWrapper( el ); + distance = o.distance || el[ ref == 'top' ? 'outerHeight': 'outerWidth' ]({ margin: true }) / 2; if ( mode == 'show' ) { -- cgit v1.2.3