slick_rails 1.3.8 → 1.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 857728d83e274c812437e470a0bdeb5012100cb4
-  data.tar.gz: ef94d7cbc618a8071074bd9e8892a161a3d3315e
+  metadata.gz: 75a32286f08ba88dd517a43bca47213d0f3a928d
+  data.tar.gz: 114afcc790034c552d3f0e3fa2ea1ec5129fd1bd
 SHA512:
-  metadata.gz: 74488bb2507f41ddcc1a4017ac4a3f5e7ba52a2e64d279cc02ac8944eb4c64e01e3fd381de109af9f751932bd3641d27f1045391333a8513a723284638e63d7c
-  data.tar.gz: b5080b9daa7639a003249ad35fc04ddce056950bebbe84d5a30da12d25e24140c183974f3800f09464ef8ef26f6cea7b98b2a328f5dd53cd0aed98c824103da4
+  metadata.gz: 4490fcfcb246d1569286374dcfe5522bc2ca9ca2a756028da93f70733c473728ddf5fe598c2d7b86d1c2116176a3211f896c4a76acbf3433d1f7f5ef568e6b86
+  data.tar.gz: bb1dd85c23b9e5f4d4bd87f52a3548522a694fb0630ee0cf0ebc37462766d83a15843379c36f320b4e4e0c74c6c631dfb64300a9b1f42f35600c755c2f5d917d

data/app/assets/javascripts/slick.js

@@ -6,7 +6,7 @@
 |___/_|_|\___|_|\_(_)/ |___/
                    |__/
 
- Version: 1.3.8
+ Version: 1.3.11
   Author: Ken Wheeler
  Website: http://kenwheeler.github.io
     Docs: http://kenwheeler.github.io/slick
@@ -619,7 +619,7 @@
 
     };
 
-    Slick.prototype.fadeSlide = function(slideIndex, callback) {
+    Slick.prototype.fadeSlide = function(oldSlide, slideIndex, callback) {
 
         var _ = this;
 
@@ -633,19 +633,29 @@
                 opacity: 1
             }, _.options.speed, _.options.easing, callback);
 
+            _.$slides.eq(oldSlide).animate({
+                opacity: 0
+            }, _.options.speed, _.options.easing);
+
         } else {
 
             _.applyTransition(slideIndex);
+            _.applyTransition(oldSlide);
 
             _.$slides.eq(slideIndex).css({
                 opacity: 1,
                 zIndex: 1000
             });
 
+            _.$slides.eq(oldSlide).css({
+                opacity: 0
+            });
+
             if (callback) {
                 setTimeout(function() {
 
                     _.disableTransition(slideIndex);
+                    _.disableTransition(oldSlide);
 
                     callback.call();
                 }, _.options.speed);
@@ -717,9 +727,6 @@
             if (_.slideCount > _.options.slidesToShow) {
                 _.slideOffset = (_.slideWidth * _.options.slidesToShow) * -1;
                 verticalOffset = (verticalHeight * _.options.slidesToShow) * -1;
-            } else {
-                _.slideOffset = 0;
-                verticalOffset = 0;
             }
             if (_.slideCount % _.options.slidesToScroll !== 0) {
                 if (slideIndex + _.options.slidesToScroll > _.slideCount && _.slideCount > _.options.slidesToShow) {
@@ -736,6 +743,11 @@
             }
         }
 
+        if (_.slideCount <= _.options.slidesToShow){
+            _.slideOffset = 0;
+            verticalOffset = 0;
+        }
+
         if (_.options.centerMode === true && _.options.infinite === true) {
             _.slideOffset += _.slideWidth * Math.floor(_.options.slidesToShow / 2) - _.slideWidth;
         } else if (_.options.centerMode === true) {
@@ -749,11 +761,20 @@
         }
 
         if (_.options.variableWidth === true) {
-            targetSlide = _.$slideTrack.children('.slick-slide').eq(slideIndex + _.options.slidesToShow);
-            targetLeft = targetSlide[0].offsetLeft * -1;
+
+            if(_.slideCount <= _.options.slidesToShow || _.options.infinite === false) {
+                targetSlide = _.$slideTrack.children('.slick-slide').eq(slideIndex);
+            } else {
+                targetSlide = _.$slideTrack.children('.slick-slide').eq(slideIndex + _.options.slidesToShow);
+            }
+            targetLeft = targetSlide[0] ? targetSlide[0].offsetLeft * -1 : 0;
             if (_.options.centerMode === true) {
-                targetSlide = _.$slideTrack.children('.slick-slide').eq(slideIndex + _.options.slidesToShow + 1);
-                targetLeft = targetSlide[0].offsetLeft * -1;
+                if(_.options.infinite === false) {
+                    targetSlide = _.$slideTrack.children('.slick-slide').eq(slideIndex);
+                } else {
+                    targetSlide = _.$slideTrack.children('.slick-slide').eq(slideIndex + _.options.slidesToShow + 1);
+                }
+                targetLeft = targetSlide[0] ? targetSlide[0].offsetLeft * -1 : 0;
                 targetLeft += (_.$list.width() - targetSlide.outerWidth()) / 2;
             }
         }
@@ -1057,6 +1078,10 @@
             _.currentSlide = _.currentSlide - _.options.slidesToScroll;
         }
 
+        if (_.slideCount <= _.options.slidesToShow) {
+            _.currentSlide = 0;
+        }
+
         _.setProps();
 
         _.setupInfinite();
@@ -1176,9 +1201,9 @@
         } else if (_.options.variableWidth === true) {
             _.slideWidth = 0;
             _.$slideTrack.children('.slick-slide').each(function(){
-                _.slideWidth += $(this).outerWidth();
+                _.slideWidth += Math.ceil($(this).outerWidth(true));
             });
-            _.$slideTrack.width(Math.ceil(_.slideWidth));
+            _.$slideTrack.width(Math.ceil(_.slideWidth) + 1);
         } else {
             _.slideWidth = Math.ceil(_.listWidth);
             _.$slideTrack.height(Math.ceil((_.$slides.first().outerHeight(true) * _.$slideTrack.children('.slick-slide').length)));
@@ -1408,7 +1433,7 @@
 
     Slick.prototype.slideHandler = function(index,sync) {
 
-        var targetSlide, animSlide, slideLeft, unevenOffset, targetLeft = null,
+        var targetSlide, animSlide, oldSlide, slideLeft, unevenOffset, targetLeft = null,
             _ = this;
 
         sync = sync || false;
@@ -1473,6 +1498,7 @@
             _.options.onBeforeChange.call(this, _, _.currentSlide, animSlide);
         }
 
+        oldSlide = _.currentSlide;
         _.currentSlide = animSlide;
 
         _.setSlideClasses(_.currentSlide);
@@ -1481,7 +1507,7 @@
         _.updateArrows();
 
         if (_.options.fade === true) {
-            _.fadeSlide(animSlide, function() {
+            _.fadeSlide(oldSlide,animSlide, function() {
                 _.postSlide(animSlide);
             });
             return false;
@@ -1798,7 +1824,7 @@
             element.slick.changeSlide({
                 data: {
                     message: 'index',
-                    index: slide
+                    index: parseInt(slide)
                 }
             });
 

data/app/assets/stylesheets/slick.css.scss

@@ -48,7 +48,8 @@ $opacity-not-active: .25;
     -moz-user-select: none;
     -ms-user-select: none;
     user-select: none;
-    -ms-touch-action: none;
+    -ms-touch-action: pan-y;
+    touch-action: pan-y;
     -webkit-tap-highlight-color: transparent;
 }
 .slick-list {

data/lib/slick_rails/version.rb

@@ -1,3 +1,3 @@
 module SlickRails
-  VERSION = "1.3.8"
+  VERSION = "1.3.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slick_rails
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.3.11
 platform: ruby
 authors:
 - Guy Israeli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-02 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler