removed easing until I can come up with a better solution

nathansearles · Feb 8, 2013 · e7b7883 · e7b7883
1 parent 8d9d555
commit e7b7883
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 27 deletions.
diff --git a/examples/basic/js/jquery.slides.min.js b/examples/basic/js/jquery.slides.min.js
diff --git a/examples/multiple/js/jquery.slides.min.js b/examples/multiple/js/jquery.slides.min.js
diff --git a/examples/playing/js/jquery.slides.min.js b/examples/playing/js/jquery.slides.min.js
diff --git a/examples/standard/js/jquery.slides.min.js b/examples/standard/js/jquery.slides.min.js
diff --git a/source/jquery.slides.coffee b/source/jquery.slides.coffee
@@ -72,13 +72,13 @@
         # Slide effect settings.
         speed: 500
           # [number] Speed in milliseconds of the slide animation.
-        easing: ""
-          # easing plug-in required: http://gsgd.co.uk/sandbox/jquery/easing/
+        #easing: ""
+          # Currently disabled
       fade:
         speed: 300
           # [number] Speed in milliseconds of the fade animation.
-        easing: ""
-          # easing plug-in required: http://gsgd.co.uk/sandbox/jquery/easing/
+        #easing: ""
+          # Currently disabled
         crossfade: true
           # [boolean] Cross-fade the transition
     callback:
@@ -642,7 +642,7 @@
         # If CSS3 isn't support use JavaScript for the animation
         slidesControl.stop().animate
           left: direction
-        , @options.effect.slide.speed, (=>
+        , @options.effect.slide.speed (=>
           slidesControl.css left: 0
           slidesControl.children(":eq(" + next + ")").css left: 0
           slidesControl.children(":eq(" + currentSlide + ")").css
@@ -710,7 +710,7 @@
         # Crossfade to next slide
         slidesControl.children(":eq(" + @data.current + ")")
         .stop()
-        .fadeOut @options.effect.fade.speed, (=>
+        .fadeOut @options.effect.fade.speed (=>
           # Reset slides
           slidesControl.children(":eq(" + next + ")").css zIndex: 10
 
@@ -730,7 +730,7 @@
         # Fade to next slide
         slidesControl.children(":eq(" + currentSlide + ")")
         .stop()
-        .fadeOut @options.effect.fade.speed, (->
+        .fadeOut @options.effect.fade.speed (->
           # Reset slides
           slidesControl.children(":eq(" + next + ")")
           .stop()

diff --git a/source/jquery.slides.js b/source/jquery.slides.js
@@ -8,7 +8,7 @@
   # Documentation and examples http://slidesjs.com
   # Support forum http://groups.google.com/group/slidesjs
 
-  # Version: 3.0.2g beta
+  # Version: 3.0.2h beta
   # Updated: February 8th, 2013
 
   # SlidesJS is an open source project, contribute at GitHub:
@@ -54,12 +54,10 @@
       },
       effect: {
         slide: {
-          speed: 500,
-          easing: ""
+          speed: 500
         },
         fade: {
           speed: 300,
-          easing: "",
           crossfade: true
         }
       },
@@ -513,7 +511,7 @@
         } else {
           return slidesControl.stop().animate({
             left: direction
-          }, this.options.effect.slide.speed, (function() {
+          }, this.options.effect.slide.speed((function() {
             slidesControl.css({
               left: 0
             });
@@ -525,7 +523,7 @@
               left: 0,
               zIndex: 0
             }, $.data(_this, "current", next), $.data(_this, "animating", false), _this.options.callback.complete(next));
-          }));
+          })));
         }
       }
     };
@@ -560,26 +558,26 @@
         });
         this.options.callback.start(currentSlide);
         if (this.options.effect.fade.crossfade) {
-          return slidesControl.children(":eq(" + this.data.current + ")").stop().fadeOut(this.options.effect.fade.speed, (function() {
+          return slidesControl.children(":eq(" + this.data.current + ")").stop().fadeOut(this.options.effect.fade.speed((function() {
             slidesControl.children(":eq(" + next + ")").css({
               zIndex: 10
             });
             $.data(_this, "animating", false);
             $.data(_this, "current", next);
             return _this.options.callback.complete();
-          }));
+          })));
         } else {
           slidesControl.children(":eq(" + next + ")").css({
             display: "none"
           });
-          return slidesControl.children(":eq(" + currentSlide + ")").stop().fadeOut(this.options.effect.fade.speed, (function() {
+          return slidesControl.children(":eq(" + currentSlide + ")").stop().fadeOut(this.options.effect.fade.speed((function() {
             slidesControl.children(":eq(" + next + ")").stop().fadeIn(this.options.effect.fade.speed).css({
               zIndex: 10
             });
             $.data(this, "animating", false);
             $.data(this, "current", next);
             return this.options.callback.complete();
-          }));
+          })));
         }
       }
     };

diff --git a/source/jquery.slides.min.js b/source/jquery.slides.min.js