slick_rails 1.3.4.1 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35ea9b05b7b63a259908075a5495ecb2494d835d
-  data.tar.gz: 12139e88ff48d3a279ecafd6292e6fab98e0b975
+  metadata.gz: 7c2813cedd34a179b68eaf92f3f1f717a6ab3ad1
+  data.tar.gz: 8c591f0a4ebaf3e114ded688931ecd4d4af50ccf
 SHA512:
-  metadata.gz: 8a397589e9c65864e9fe12308d0ea2898d3ceda5cea0282a11b8d76502cd2bd99c47d42f8b79451f962ddfcb39eecbde87ffaa56cc485e1b53c6310eca20b074
-  data.tar.gz: ec46fb958b9fb283273eeffba772535a984fbd693d1ccadc299d62d1d3da3a4c6a90ef11a9deabce5fc05cbe44c21d3dc502f3518ae45626767481b7c3f66585
+  metadata.gz: 44c231aa0bfc0ee91997ea4a1fd53742d6b326735b8b2b5cd1b73e2ae17c36f4d460ec13704d914589edb72142186625d922f6bf69adb4cb2f4b5292934790ee
+  data.tar.gz: 30331f179ae37b055f434c03f3783638c0de76999c97e00cd8fb3cb46df4ce84bd5688f7f021a64521f8fd45b5628f3fa05e7b4133e055522008f81689588410

data/app/assets/javascripts/slick.js

@@ -185,6 +185,8 @@
 
         _.$slideTrack.append(_.$slides);
 
+        _.$slidesCache = _.$slides;
+
         _.reinit();
 
     };
@@ -223,7 +225,7 @@
                             _.$slideTrack.css(animProps);
                         } else {
                             animProps[_.animType] = 'translate(0px,' +
-                                now + 'px,0px)';
+                                now + 'px)';
                             _.$slideTrack.css(animProps);
                         }
                     },
@@ -738,16 +740,14 @@
             action: 'end'
         }, _.swipeHandler);
 
-        _.$list.on('dragstart.slick', function(e) {
-            e.preventDefault();
-        });
-
         if (_.options.pauseOnHover === true && _.options.autoplay === true) {
             _.$list.on('mouseenter.slick', _.autoPlayClear);
             _.$list.on('mouseleave.slick', _.autoPlay);
         }
 
-        _.$list.on('keydown.slick', _.keyHandler);
+        if(_.options.accessibility === true) {
+            _.$list.on('keydown.slick', _.keyHandler); 
+        }
 
         $(window).on('orientationchange.slick.slick-' + _.instanceUid, function() {
             _.checkResponsive();
@@ -830,18 +830,24 @@
         loadRange = _.$slider.find('.slick-slide').slice(rangeStart, rangeEnd);
 
         $('img[data-lazy]', loadRange).not('[src]').each(function() {
-            $(this).attr('src', $(this).attr('data-lazy')).removeClass('slick-loading');
+            $(this).css({opacity: 0}).attr('src', $(this).attr('data-lazy')).removeClass('slick-loading').load(function(){
+                $(this).animate({ opacity: 1 }, 200);
+            });
         });
 
         if (_.currentSlide >= _.slideCount - _.options.slidesToShow) {
             cloneRange = _.$slider.find('.slick-cloned').slice(0, _.options.slidesToShow);
             $('img[data-lazy]', cloneRange).not('[src]').each(function() {
-                $(this).attr('src', $(this).attr('data-lazy')).removeClass('slick-loading');
+                $(this).css({opacity: 0}).attr('src', $(this).attr('data-lazy')).removeClass('slick-loading').load(function(){
+                    $(this).animate({ opacity: 1 }, 200);
+                });
             });
         } else if (_.currentSlide === 0) {
             cloneRange = _.$slider.find('.slick-cloned').slice(_.options.slidesToShow * -1);
             $('img[data-lazy]', cloneRange).not('[src]').each(function() {
-                $(this).attr('src', $(this).attr('data-lazy')).removeClass('slick-loading');
+                $(this).css({opacity: 0}).attr('src', $(this).attr('data-lazy')).removeClass('slick-loading').load(function(){
+                    $(this).animate({ opacity: 1 }, 200);
+                });
             });
         }
 
@@ -857,30 +863,12 @@
             opacity: 1
         });
 
-        if (document.readyState !== 'complete') {
-
-            $(window).load(function() {
-
-                _.$slider.removeClass('slick-loading');
-
-                _.initUI();
+        _.$slider.removeClass('slick-loading');
 
-                if (_.options.lazyLoad === 'progressive') {
-                    _.progressiveLazyLoad();
-                }
-
-            });
-
-        } else {
-
-            _.$slider.removeClass('slick-loading');
-
-            _.initUI();
-
-            if (_.options.lazyLoad === 'progressive') {
-                _.progressiveLazyLoad();
-            }
+        _.initUI();
 
+        if (_.options.lazyLoad === 'progressive') {
+            _.progressiveLazyLoad();
         }
 
     };
@@ -889,22 +877,16 @@
 
         var _ = this;
 
-        if (_.options.onAfterChange !== null && index !== _.currentSlide) {
+        if (_.options.onAfterChange !== null) {
             _.options.onAfterChange.call(this, _, index);
         }
 
         _.animating = false;
 
-        _.currentSlide = index;
-
         _.setPosition();
 
         _.swipeLeft = null;
 
-        _.updateDots();
-
-        _.updateArrows();
-
         if (_.options.autoplay === true && _.paused === false) {
             _.autoPlay();
         }
@@ -1006,6 +988,8 @@
 
         _.$slideTrack.append(_.$slides);
 
+        _.$slidesCache = _.$slides;
+
         _.reinit();
 
     };
@@ -1040,15 +1024,15 @@
         var _ = this;
 
         if (_.options.centerMode === true) {
-            _.$list.find('.slick-slide').width(_.slideWidth);
+            _.$slideTrack.children('.slick-slide').width(_.slideWidth);
         } else {
-            _.$list.find('.slick-slide').width(_.slideWidth);
+            _.$slideTrack.children('.slick-slide').width(_.slideWidth);
         }
 
 
         if (_.options.vertical === false) {
             _.$slideTrack.width(Math.ceil((_.slideWidth * _
-                .$slider.find('.slick-slide').length)));
+                .$slideTrack.children('.slick-slide').length)));
             if (_.options.centerMode === true) {
                 _.$list.css({
                     padding: ('0px ' + _.options.centerPadding)
@@ -1057,7 +1041,7 @@
         } else {
             _.$list.height(_.$slides.first().outerHeight());
             _.$slideTrack.height(Math.ceil((_.listHeight * _
-                .$slider.find('.slick-slide').length)));
+                .$slideTrack.children('.slick-slide').length)));
             if (_.options.centerMode === true) {
                 _.$list.css({
                     padding: (_.options.centerPadding + ' 0px')
@@ -1244,7 +1228,7 @@
 
     Slick.prototype.slideHandler = function(index) {
 
-        var targetSlide, animSlide, slideLeft, targetLeft = null,
+        var targetSlide, animSlide, slideLeft, unevenOffset, targetLeft = null,
             _ = this;
 
         if (_.animating === true) {
@@ -1255,7 +1239,11 @@
         targetLeft = _.getLeft(targetSlide);
         slideLeft = _.getLeft(_.currentSlide);
 
-        if (_.options.infinite === false && (index < 0 || index > (_.slideCount - _.options.slidesToShow))) {
+        unevenOffset = _.slideCount % _.options.slidesToScroll !== 0 ? _.options.slidesToScroll : 0;
+
+        _.currentLeft = _.swipeLeft === null ? slideLeft : _.swipeLeft;
+
+        if (_.options.infinite === false && (index < 0 || index > (_.slideCount - _.options.slidesToShow + unevenOffset))) {
             targetSlide = _.currentSlide;
             _.animateSlide(slideLeft, function() {
                 _.postSlide(targetSlide);
@@ -1267,8 +1255,6 @@
             clearInterval(_.autoPlayTimer);
         }
 
-        _.currentLeft = _.swipeLeft === null ? slideLeft : _.swipeLeft;
-
         if (targetSlide < 0) {
             if (_.slideCount % _.options.slidesToScroll !== 0) {
                 animSlide = _.slideCount - (_.slideCount % _.options.slidesToScroll);
@@ -1284,9 +1270,13 @@
         _.animating = true;
 
         if (_.options.onBeforeChange !== null && index !== _.currentSlide) {
-            _.options.onBeforeChange.call(this, _, _.currentSlide);
+            _.options.onBeforeChange.call(this, _, _.currentSlide, animSlide);
         }
 
+        _.currentSlide = animSlide;
+        _.updateDots();
+        _.updateArrows();
+
         if (_.options.fade === true) {
             _.fadeSlide(animSlide, function() {
                 _.postSlide(animSlide);
@@ -1359,7 +1349,6 @@
         }
 
         if (_.touchObject.swipeLength >= _.touchObject.minSwipe) {
-
             $(event.target).on('click.slick', function(event) {
                 event.stopImmediatePropagation();
                 event.stopPropagation();
@@ -1378,10 +1367,11 @@
                     _.touchObject = {};
                     break;
             }
-
         } else {
-            _.slideHandler(_.currentSlide);
-            _.touchObject = {};
+            if(_.touchObject.startX !== _.touchObject.curX) {
+                _.slideHandler(_.currentSlide);
+                _.touchObject = {};
+            }
         }
 
     };
@@ -1390,9 +1380,9 @@
 
         var _ = this;
 
-        if (event.originalEvent && event.originalEvent.touches && _.options.swipe === false) {
+        if ('ontouchend' in document && _.options.swipe === false) {
             return false;
-        } else if (_.options.draggable === false) {
+        } else if (_.options.draggable === false && !event.originalEvent.touches) {
             return false;
         }
 
@@ -1442,10 +1432,10 @@
         swipeDirection = _.swipeDirection();
 
         if (swipeDirection === 'vertical') {
-            return false;
+            return;
         }
 
-        if (event.originalEvent !== undefined) {
+        if (event.originalEvent !== undefined && _.touchObject.swipeLength > 4) {
             event.preventDefault();
         }
 

data/lib/slick_rails/version.rb

@@ -1,3 +1,3 @@
 module SlickRails
-  VERSION = "1.3.4.1"
+  VERSION = "1.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slick_rails
 version: !ruby/object:Gem::Version
-  version: 1.3.4.1
+  version: 1.3.5
 platform: ruby
 authors:
 - Guy Israeli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler