Allow all options for animation jQuery.animate() accepts (removes the…

… easing option)

README.markdown

@@ -135,15 +135,9 @@ jCarousel accepts a list of options to control the behaviour of the carousel. He
     </tr>
     <tr>
         <td>animation</td>
-        <td>mixed</td>
+        <td>integer|string|object</td>
         <td>&quot;normal&quot;</td>
-        <td>The speed of the scroll animation as string in jQuery terms (<code>"slow"</code> or <code>"fast"</code>) or milliseconds as integer (See the <a href="http://api.jquery.com/animate">jQuery Documentation</a>). If set to 0, animation is turned off.</td>
-    </tr>
-    <tr>
-        <td>easing</td>
-        <td>string</td>
-        <td>&quot;swing&quot;</td>
-        <td>The name of the easing effect that you want to use (See the <a href="http://api.jquery.com/animate#easing">jQuery Documentation</a>).</td>
+        <td>The speed of the scroll animation as string in jQuery terms (<code>"slow"</code> or <code>"fast"</code>) or milliseconds as integer (See the <a href="http://api.jquery.com/animate">jQuery Documentation</a>). If set to 0, animation is turned off. Alternatively, this can be a map of options like the one [jQuery.animate](http://api.jquery.com/animate/#animate-properties-options) accepts as second argument.</td>
     </tr>
     <tr>
         <td>wrap</td>

src/jquery.jcarousel.js

@@ -339,10 +339,18 @@
                 this.list.css(properties);
                 this.onAnimationComplete(callback);
             } else {
-                var self = this;
-                this.list.animate(properties, this.options.animation, this.options.easing, function() {
+                var self = this, 
+                    opts = typeof this.options.animation === 'object' ? this.options.animation : {duration: this.options.animation},
+                    oldcomplete = opts.complete;
+
+                opts.complete = function() {
+                    if ($.isFunction(oldcomplete)) {
+                        oldcomplete.call(this);
+                    }
                     self.onAnimationComplete(callback);
-                });
+                };
+
+                this.list.animate(properties, opts);
             }
 
             return this;
@@ -509,7 +517,6 @@
             start:     0,
             scroll:    1,
             animation: 'normal',
-            easing:    'swing',
             wrap:      null
         },
         itemData: ['first', 'last', 'visible'],

test/functional/animation.html

@@ -36,8 +36,11 @@
         animation: 'fast'
     });
     $('#jcarousel2').jcarousel({
-        animation: 1000,
-        easing: 'BounceEaseOut'
+        animation: {
+            duration: 1000,
+            easing: 'BounceEaseOut'
+        },
+        wrap: 'circular'
     });
 });