From: gnarf <gnarf@gnarf.net>
Date: Thu, 3 Mar 2011 01:46:46 +0000 (-0600)
Subject: Quick rewrite for new options object
X-Git-Tag: 1.9m5~235^2~26
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5fd1f17393d8467b3c873a379f4c55b9aa279ad1;p=jquery-ui.git

Quick rewrite for new options object
---

diff --git a/ui/jquery.effects.bounce.js b/ui/jquery.effects.bounce.js
index 055b47596..188c2809f 100644
--- a/ui/jquery.effects.bounce.js
+++ b/ui/jquery.effects.bounce.js
@@ -17,14 +17,13 @@ $.effects.bounce = function(o) {
 	return this.queue(function() {
 
 		// Create element
-		var el = $(this), props = ['position','top','bottom','left','right'];
-
-		// 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
+		var el = $( this ), 
+			props = [ 'position', 'top', 'bottom', 'left', 'right' ],
+			mode = $.effects.setMode( el, o.mode || 'effect' ),
+			direction = o.direction || 'up', // Default direction
+			distance = o.distance || 20, // Default distance
+			times = o.times || 5, // Default # of times
+			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
 
 		// Adjust
@@ -32,7 +31,7 @@ $.effects.bounce = function(o) {
 		$.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);
+		var distance = o.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--;
@@ -41,7 +40,7 @@ $.effects.bounce = function(o) {
 		if (mode == 'show') { // Show Bounce
 			var animation = {opacity: 1};
 			animation[ref] = (motion == 'pos' ? '+=' : '-=') + distance;
-			el.animate(animation, speed / 2, o.options.easing);
+			el.animate(animation, speed / 2, o.easing);
 			distance = distance / 2;
 			times--;
 		};
@@ -49,24 +48,24 @@ $.effects.bounce = function(o) {
 			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);
+			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 == 'pos' ? '-=' : '+=')  + distance;
-			el.animate(animation, speed / 2, o.options.easing, function(){
+			el.animate(animation, speed / 2, o.easing, function(){
 				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
 			});
 		} 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(){
+			el.animate(animation1, speed / 2, o.easing).animate(animation2, speed / 2, o.easing, function(){
 				$.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.queue('fx', function() { el.dequeue(); });