jquery-slick-rails 1.5.9.1 → 1.6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1a195d0fd613ca2030a176ca5845cc35a7e095b
-  data.tar.gz: f6ef8127e21521088339010f29b94cb51512b2d3
+  metadata.gz: 0cd361a8085db54d090b8ac04245879f68ebdda1
+  data.tar.gz: c37e070e85bcefc251cb957d8156d50a8a193e1a
 SHA512:
-  metadata.gz: b7fe5ff9df2ce71791a0c630c8eede1d69f720497306fe8d110c701445f497dab566ff5643199fb9202417df3283d8df70c764300df77a1abbd101b903777c03
-  data.tar.gz: d1a2f038d5ff88898532a7343ec598c3062caed8792ad92af964b54d93858e04a61fbdc4809cccc08cdb6586e5908cd22c40b6430eb7e131326032955102594a
+  metadata.gz: f4478e33eaac3f1273fa98843bd1b19d5631988ba27ac0c312a8038b3d40523e7d4396139f61b9dece3c714b565e0dce705263fb84df288c02f5ed280db507a6
+  data.tar.gz: 88a82c8177a36a829e037222de66b69647c84eafa203081d8318001f3ab18c243d039a7c9cccbea93c40090456cb85e26ac0325464e16e22f86c1ad8d77c17f3

data/app/assets/javascripts/jquery.slick.js

@@ -6,7 +6,7 @@
  |___/_|_|\___|_|\_(_)/ |___/
  |__/
 
- Version: 1.5.9
+ Version: 1.6.0
  Author: Ken Wheeler
  Website: http://kenwheeler.github.io
  Docs: http://kenwheeler.github.io/slick
@@ -52,7 +52,7 @@
         centerPadding: '50px',
         cssEase: 'ease',
         customPaging: function(slider, i) {
-          return '<button type="button" data-role="none" role="button" aria-required="false" tabindex="0">' + (i + 1) + '</button>';
+          return $('<button type="button" data-role="none" role="button" tabindex="0" />').text(i + 1);
         },
         dots: false,
         dotsClass: 'slick-dots',
@@ -66,6 +66,7 @@
         lazyLoad: 'ondemand',
         mobileFirst: false,
         pauseOnHover: true,
+        pauseOnFocus: true,
         pauseOnDotsHover: false,
         respondTo: 'window',
         responsive: null,
@@ -81,7 +82,7 @@
         touchMove: true,
         touchThreshold: 5,
         useCSS: true,
-        useTransform: false,
+        useTransform: true,
         variableWidth: false,
         vertical: false,
         verticalSwiping: false,
@@ -124,8 +125,10 @@
       _.breakpoints = [];
       _.breakpointSettings = [];
       _.cssTransitions = false;
+      _.focussed = false;
+      _.interrupted = false;
       _.hidden = 'hidden';
-      _.paused = false;
+      _.paused = true;
       _.positionProp = null;
       _.respondTo = null;
       _.rowCount = 1;
@@ -140,7 +143,7 @@
 
       dataSettings = $(element).data('slick') || {};
 
-      _.options = $.extend({}, _.defaults, dataSettings, settings);
+      _.options = $.extend({}, _.defaults, settings, dataSettings);
 
       _.currentSlide = _.options.initialSlide;
 
@@ -156,6 +159,7 @@
 
       _.autoPlay = $.proxy(_.autoPlay, _);
       _.autoPlayClear = $.proxy(_.autoPlayClear, _);
+      _.autoPlayIterator = $.proxy(_.autoPlayIterator, _);
       _.changeSlide = $.proxy(_.changeSlide, _);
       _.clickHandler = $.proxy(_.clickHandler, _);
       _.selectHandler = $.proxy(_.selectHandler, _);
@@ -163,7 +167,6 @@
       _.swipeHandler = $.proxy(_.swipeHandler, _);
       _.dragHandler = $.proxy(_.dragHandler, _);
       _.keyHandler = $.proxy(_.keyHandler, _);
-      _.autoPlayIterator = $.proxy(_.autoPlayIterator, _);
 
       _.instanceUid = instanceUid++;
 
@@ -175,7 +178,6 @@
 
       _.registerBreakpoints();
       _.init(true);
-      _.checkResponsive(true);
 
     }
 
@@ -183,6 +185,17 @@
 
   }());
 
+  Slick.prototype.activateADA = function() {
+    var _ = this;
+
+    _.$slideTrack.find('.slick-active').attr({
+      'aria-hidden': 'false'
+    }).find('a, input, button, select').attr({
+      'tabindex': '0'
+    });
+
+  };
+
   Slick.prototype.addSlide = Slick.prototype.slickAdd = function(markup, index, addBefore) {
 
     var _ = this;
@@ -318,7 +331,7 @@
 
   };
 
-  Slick.prototype.asNavFor = function(index) {
+  Slick.prototype.getNavTarget = function() {
 
     var _ = this,
         asNavFor = _.options.asNavFor;
@@ -327,6 +340,15 @@
       asNavFor = $(asNavFor).not(_.$slider);
     }
 
+    return asNavFor;
+
+  };
+
+  Slick.prototype.asNavFor = function(index) {
+
+    var _ = this,
+        asNavFor = _.getNavTarget();
+
     if ( asNavFor !== null && typeof asNavFor === 'object' ) {
       asNavFor.each(function() {
         var target = $(this).slick('getSlick');
@@ -361,13 +383,10 @@
 
     var _ = this;
 
-    if (_.autoPlayTimer) {
-      clearInterval(_.autoPlayTimer);
-    }
+    _.autoPlayClear();
 
-    if (_.slideCount > _.options.slidesToShow && _.paused !== true) {
-      _.autoPlayTimer = setInterval(_.autoPlayIterator,
-          _.options.autoplaySpeed);
+    if ( _.slideCount > _.options.slidesToShow ) {
+      _.autoPlayTimer = setInterval( _.autoPlayIterator, _.options.autoplaySpeed );
     }
 
   };
@@ -375,6 +394,7 @@
   Slick.prototype.autoPlayClear = function() {
 
     var _ = this;
+
     if (_.autoPlayTimer) {
       clearInterval(_.autoPlayTimer);
     }
@@ -383,34 +403,30 @@
 
   Slick.prototype.autoPlayIterator = function() {
 
-    var _ = this;
+    var _ = this,
+        slideTo = _.currentSlide + _.options.slidesToScroll;
 
-    if (_.options.infinite === false) {
+    if ( !_.paused && !_.interrupted && !_.focussed ) {
 
-      if (_.direction === 1) {
+      if ( _.options.infinite === false ) {
 
-        if ((_.currentSlide + 1) === _.slideCount -
-            1) {
+        if ( _.direction === 1 && ( _.currentSlide + 1 ) === ( _.slideCount - 1 )) {
           _.direction = 0;
         }
 
-        _.slideHandler(_.currentSlide + _.options.slidesToScroll);
+        else if ( _.direction === 0 ) {
 
-      } else {
+          slideTo = _.currentSlide - _.options.slidesToScroll;
 
-        if ((_.currentSlide - 1 === 0)) {
-
-          _.direction = 1;
+          if ( _.currentSlide - 1 === 0 ) {
+            _.direction = 1;
+          }
 
         }
 
-        _.slideHandler(_.currentSlide - _.options.slidesToScroll);
-
       }
 
-    } else {
-
-      _.slideHandler(_.currentSlide + _.options.slidesToScroll);
+      _.slideHandler( slideTo );
 
     }
 
@@ -463,20 +479,19 @@
   Slick.prototype.buildDots = function() {
 
     var _ = this,
-        i, dotString;
+        i, dot;
 
     if (_.options.dots === true && _.slideCount > _.options.slidesToShow) {
 
-      dotString = '<ul class="' + _.options.dotsClass + '">';
+      _.$slider.addClass('slick-dotted');
+
+      dot = $('<ul />').addClass(_.options.dotsClass);
 
       for (i = 0; i <= _.getDotCount(); i += 1) {
-        dotString += '<li>' + _.options.customPaging.call(this, _, i) + '</li>';
+        dot.append($('<li />').append(_.options.customPaging.call(this, _, i)));
       }
 
-      dotString += '</ul>';
-
-      _.$dots = $(dotString).appendTo(
-          _.options.appendDots);
+      _.$dots = dot.appendTo(_.options.appendDots);
 
       _.$dots.find('li').first().addClass('slick-active').attr('aria-hidden', 'false');
 
@@ -563,7 +578,7 @@
         newSlides.appendChild(slide);
       }
 
-      _.$slider.html(newSlides);
+      _.$slider.empty().append(newSlides);
       _.$slider.children().children().children()
           .css({
             'width':(100 / _.options.slidesPerRow) + '%',
@@ -665,7 +680,7 @@
   Slick.prototype.changeSlide = function(event, dontAnimate) {
 
     var _ = this,
-        $target = $(event.target),
+        $target = $(event.currentTarget),
         indexOffset, slideOffset, unevenOffset;
 
     // If target is a link, prevent default action.
@@ -739,18 +754,15 @@
 
     if (_.options.dots && _.$dots !== null) {
 
-      $('li', _.$dots).off('click.slick', _.changeSlide);
-
-      if (_.options.pauseOnDotsHover === true && _.options.autoplay === true) {
-
-        $('li', _.$dots)
-            .off('mouseenter.slick', $.proxy(_.setPaused, _, true))
-            .off('mouseleave.slick', $.proxy(_.setPaused, _, false));
-
-      }
+      $('li', _.$dots)
+          .off('click.slick', _.changeSlide)
+          .off('mouseenter.slick', $.proxy(_.interrupt, _, true))
+          .off('mouseleave.slick', $.proxy(_.interrupt, _, false));
 
     }
 
+    _.$slider.off('focus.slick blur.slick');
+
     if (_.options.arrows === true && _.slideCount > _.options.slidesToShow) {
       _.$prevArrow && _.$prevArrow.off('click.slick', _.changeSlide);
       _.$nextArrow && _.$nextArrow.off('click.slick', _.changeSlide);
@@ -765,8 +777,7 @@
 
     $(document).off(_.visibilityChange, _.visibility);
 
-    _.$list.off('mouseenter.slick', $.proxy(_.setPaused, _, true));
-    _.$list.off('mouseleave.slick', $.proxy(_.setPaused, _, false));
+    _.cleanUpSlideEvents();
 
     if (_.options.accessibility === true) {
       _.$list.off('keydown.slick', _.keyHandler);
@@ -784,6 +795,16 @@
 
     $(window).off('load.slick.slick-' + _.instanceUid, _.setPosition);
     $(document).off('ready.slick.slick-' + _.instanceUid, _.setPosition);
+
+  };
+
+  Slick.prototype.cleanUpSlideEvents = function() {
+
+    var _ = this;
+
+    _.$list.off('mouseenter.slick', $.proxy(_.interrupt, _, true));
+    _.$list.off('mouseleave.slick', $.proxy(_.interrupt, _, false));
+
   };
 
   Slick.prototype.cleanUpRows = function() {
@@ -793,7 +814,7 @@
     if(_.options.rows > 1) {
       originalSlides = _.$slides.children().children();
       originalSlides.removeAttr('style');
-      _.$slider.html(originalSlides);
+      _.$slider.empty().append(originalSlides);
     }
 
   };
@@ -832,7 +853,7 @@
       _.$prevArrow
           .removeClass('slick-disabled slick-arrow slick-hidden')
           .removeAttr('aria-hidden aria-disabled tabindex')
-          .css("display","");
+          .css('display','');
 
       if ( _.htmlExpr.test( _.options.prevArrow )) {
         _.$prevArrow.remove();
@@ -844,7 +865,7 @@
       _.$nextArrow
           .removeClass('slick-disabled slick-arrow slick-hidden')
           .removeAttr('aria-hidden aria-disabled tabindex')
-          .css("display","");
+          .css('display','');
 
       if ( _.htmlExpr.test( _.options.nextArrow )) {
         _.$nextArrow.remove();
@@ -876,6 +897,7 @@
 
     _.$slider.removeClass('slick-slider');
     _.$slider.removeClass('slick-initialized');
+    _.$slider.removeClass('slick-dotted');
 
     _.unslicked = true;
 
@@ -980,6 +1002,30 @@
 
   };
 
+  Slick.prototype.focusHandler = function() {
+
+    var _ = this;
+
+    _.$slider
+        .off('focus.slick blur.slick')
+        .on('focus.slick blur.slick',
+            '*:not(.slick-arrow)', function(event) {
+
+              event.stopImmediatePropagation();
+              var $sf = $(this);
+
+              setTimeout(function() {
+
+                if( _.options.pauseOnFocus ) {
+                  _.focussed = $sf.is(':focus');
+                  _.autoPlay();
+                }
+
+              }, 0);
+
+            });
+  };
+
   Slick.prototype.getCurrent = Slick.prototype.slickCurrentSlide = function() {
 
     var _ = this;
@@ -1204,6 +1250,8 @@
       _.initializeEvents();
       _.updateArrows();
       _.updateDots();
+      _.checkResponsive(true);
+      _.focusHandler();
 
     }
 
@@ -1215,6 +1263,48 @@
       _.initADA();
     }
 
+    if ( _.options.autoplay ) {
+
+      _.paused = false;
+      _.autoPlay();
+
+    }
+
+  };
+
+  Slick.prototype.initADA = function() {
+    var _ = this;
+    _.$slides.add(_.$slideTrack.find('.slick-cloned')).attr({
+      'aria-hidden': 'true',
+      'tabindex': '-1'
+    }).find('a, input, button, select').attr({
+      'tabindex': '-1'
+    });
+
+    _.$slideTrack.attr('role', 'listbox');
+
+    _.$slides.not(_.$slideTrack.find('.slick-cloned')).each(function(i) {
+      $(this).attr({
+        'role': 'option',
+        'aria-describedby': 'slick-slide' + _.instanceUid + i + ''
+      });
+    });
+
+    if (_.$dots !== null) {
+      _.$dots.attr('role', 'tablist').find('li').each(function(i) {
+            $(this).attr({
+              'role': 'presentation',
+              'aria-selected': 'false',
+              'aria-controls': 'navigation' + _.instanceUid + i + '',
+              'id': 'slick-slide' + _.instanceUid + i + ''
+            });
+          })
+          .first().attr('aria-selected', 'true').end()
+          .find('button').attr('role', 'button').end()
+          .closest('div').attr('role', 'toolbar');
+    }
+    _.activateADA();
+
   };
 
   Slick.prototype.initArrowEvents = function() {
@@ -1222,12 +1312,16 @@
     var _ = this;
 
     if (_.options.arrows === true && _.slideCount > _.options.slidesToShow) {
-      _.$prevArrow.on('click.slick', {
-        message: 'previous'
-      }, _.changeSlide);
-      _.$nextArrow.on('click.slick', {
-        message: 'next'
-      }, _.changeSlide);
+      _.$prevArrow
+          .off('click.slick')
+          .on('click.slick', {
+            message: 'previous'
+          }, _.changeSlide);
+      _.$nextArrow
+          .off('click.slick')
+          .on('click.slick', {
+            message: 'next'
+          }, _.changeSlide);
     }
 
   };
@@ -1242,10 +1336,25 @@
       }, _.changeSlide);
     }
 
-    if (_.options.dots === true && _.options.pauseOnDotsHover === true && _.options.autoplay === true) {
+    if ( _.options.dots === true && _.options.pauseOnDotsHover === true ) {
+
       $('li', _.$dots)
-          .on('mouseenter.slick', $.proxy(_.setPaused, _, true))
-          .on('mouseleave.slick', $.proxy(_.setPaused, _, false));
+          .on('mouseenter.slick', $.proxy(_.interrupt, _, true))
+          .on('mouseleave.slick', $.proxy(_.interrupt, _, false));
+
+    }
+
+  };
+
+  Slick.prototype.initSlideEvents = function() {
+
+    var _ = this;
+
+    if ( _.options.pauseOnHover ) {
+
+      _.$list.on('mouseenter.slick', $.proxy(_.interrupt, _, true));
+      _.$list.on('mouseleave.slick', $.proxy(_.interrupt, _, false));
+
     }
 
   };
@@ -1257,6 +1366,7 @@
     _.initArrowEvents();
 
     _.initDotEvents();
+    _.initSlideEvents();
 
     _.$list.on('touchstart.slick mousedown.slick', {
       action: 'start'
@@ -1275,9 +1385,6 @@
 
     $(document).on(_.visibilityChange, $.proxy(_.visibility, _));
 
-    _.$list.on('mouseenter.slick', $.proxy(_.setPaused, _, true));
-    _.$list.on('mouseleave.slick', $.proxy(_.setPaused, _, false));
-
     if (_.options.accessibility === true) {
       _.$list.on('keydown.slick', _.keyHandler);
     }
@@ -1314,12 +1421,6 @@
 
     }
 
-    if (_.options.autoplay === true) {
-
-      _.autoPlay();
-
-    }
-
   };
 
   Slick.prototype.keyHandler = function(event) {
@@ -1330,13 +1431,13 @@
       if (event.keyCode === 37 && _.options.accessibility === true) {
         _.changeSlide({
           data: {
-            message: 'previous'
+            message: _.options.rtl === true ? 'next' :  'previous'
           }
         });
       } else if (event.keyCode === 39 && _.options.accessibility === true) {
         _.changeSlide({
           data: {
-            message: 'next'
+            message: _.options.rtl === true ? 'previous' : 'next'
           }
         });
       }
@@ -1350,6 +1451,7 @@
         loadRange, cloneRange, rangeStart, rangeEnd;
 
     function loadImages(imagesScope) {
+
       $('img[data-lazy]', imagesScope).each(function() {
 
         var image = $(this),
@@ -1357,6 +1459,7 @@
             imageToLoad = document.createElement('img');
 
         imageToLoad.onload = function() {
+
           image
               .animate({ opacity: 0 }, 100, function() {
                 image
@@ -1366,12 +1469,26 @@
                           .removeAttr('data-lazy')
                           .removeClass('slick-loading');
                     });
+                _.$slider.trigger('lazyLoaded', [_, image, imageSource]);
               });
+
+        };
+
+        imageToLoad.onerror = function() {
+
+          image
+              .removeAttr( 'data-lazy' )
+              .removeClass( 'slick-loading' )
+              .addClass( 'slick-lazyload-error' );
+
+          _.$slider.trigger('lazyLoadError', [ _, image, imageSource ]);
+
         };
 
         imageToLoad.src = imageSource;
 
       });
+
     }
 
     if (_.options.centerMode === true) {
@@ -1384,7 +1501,7 @@
       }
     } else {
       rangeStart = _.options.infinite ? _.options.slidesToShow + _.currentSlide : _.currentSlide;
-      rangeEnd = rangeStart + _.options.slidesToShow;
+      rangeEnd = Math.ceil(rangeStart + _.options.slidesToShow);
       if (_.options.fade === true) {
         if (rangeStart > 0) rangeStart--;
         if (rangeEnd <= _.slideCount) rangeEnd++;
@@ -1462,8 +1579,11 @@
 
     var _ = this;
 
-    _.paused = false;
     _.autoPlay();
+    _.options.autoplay = true;
+    _.paused = false;
+    _.focussed = false;
+    _.interrupted = false;
 
   };
 
@@ -1471,19 +1591,24 @@
 
     var _ = this;
 
-    _.$slider.trigger('afterChange', [_, index]);
+    if( !_.unslicked ) {
 
-    _.animating = false;
+      _.$slider.trigger('afterChange', [_, index]);
 
-    _.setPosition();
+      _.animating = false;
 
-    _.swipeLeft = null;
+      _.setPosition();
+
+      _.swipeLeft = null;
+
+      if ( _.options.autoplay ) {
+        _.autoPlay();
+      }
+
+      if (_.options.accessibility === true) {
+        _.initADA();
+      }
 
-    if (_.options.autoplay === true && _.paused === false) {
-      _.autoPlay();
-    }
-    if (_.options.accessibility === true) {
-      _.initADA();
     }
 
   };
@@ -1501,50 +1626,97 @@
   };
 
   Slick.prototype.preventDefault = function(event) {
+
     event.preventDefault();
+
   };
 
-  Slick.prototype.progressiveLazyLoad = function() {
+  Slick.prototype.progressiveLazyLoad = function( tryCount ) {
+
+    tryCount = tryCount || 1;
 
     var _ = this,
-        imgCount, targetImage;
+        $imgsToLoad = $( 'img[data-lazy]', _.$slider ),
+        image,
+        imageSource,
+        imageToLoad;
 
-    imgCount = $('img[data-lazy]', _.$slider).length;
+    if ( $imgsToLoad.length ) {
 
-    if (imgCount > 0) {
-      targetImage = $('img[data-lazy]', _.$slider).first();
-      targetImage.attr('src', null);
-      targetImage.attr('src', targetImage.attr('data-lazy')).removeClass('slick-loading').load(function() {
-            targetImage.removeAttr('data-lazy');
-            _.progressiveLazyLoad();
+      image = $imgsToLoad.first();
+      imageSource = image.attr('data-lazy');
+      imageToLoad = document.createElement('img');
+
+      imageToLoad.onload = function() {
+
+        image
+            .attr( 'src', imageSource )
+            .removeAttr('data-lazy')
+            .removeClass('slick-loading');
+
+        if ( _.options.adaptiveHeight === true ) {
+          _.setPosition();
+        }
+
+        _.$slider.trigger('lazyLoaded', [ _, image, imageSource ]);
+        _.progressiveLazyLoad();
+
+      };
+
+      imageToLoad.onerror = function() {
+
+        if ( tryCount < 3 ) {
+
+          /**
+           * try to load the image 3 times,
+           * leave a slight delay so we don't get
+           * servers blocking the request.
+           */
+          setTimeout( function() {
+            _.progressiveLazyLoad( tryCount + 1 );
+          }, 500 );
+
+        } else {
+
+          image
+              .removeAttr( 'data-lazy' )
+              .removeClass( 'slick-loading' )
+              .addClass( 'slick-lazyload-error' );
+
+          _.$slider.trigger('lazyLoadError', [ _, image, imageSource ]);
+
+          _.progressiveLazyLoad();
+
+        }
+
+      };
+
+      imageToLoad.src = imageSource;
+
+    } else {
+
+      _.$slider.trigger('allImagesLoaded', [ _ ]);
 
-            if (_.options.adaptiveHeight === true) {
-              _.setPosition();
-            }
-          })
-          .error(function() {
-            targetImage.removeAttr('data-lazy');
-            _.progressiveLazyLoad();
-          });
     }
 
   };
 
   Slick.prototype.refresh = function( initializing ) {
 
-    var _ = this, currentSlide, firstVisible;
+    var _ = this, currentSlide, lastVisibleIndex;
 
-    firstVisible = _.slideCount - _.options.slidesToShow;
+    lastVisibleIndex = _.slideCount - _.options.slidesToShow;
+
+    // in non-infinite sliders, we don't want to go past the
+    // last visible index.
+    if( !_.options.infinite && ( _.currentSlide > lastVisibleIndex )) {
+      _.currentSlide = lastVisibleIndex;
+    }
+
+    // if less slides than to show, go to start.
+    if ( _.slideCount <= _.options.slidesToShow ) {
+      _.currentSlide = 0;
 
-    // check that the new breakpoint can actually accept the
-    // "current slide" as the current slide, otherwise we need
-    // to set it to the closest possible value.
-    if ( !_.options.infinite ) {
-      if ( _.slideCount <= _.options.slidesToShow ) {
-        _.currentSlide = 0;
-      } else if ( _.currentSlide > firstVisible ) {
-        _.currentSlide = firstVisible;
-      }
     }
 
     currentSlide = _.currentSlide;
@@ -1573,7 +1745,7 @@
     var _ = this, breakpoint, currentBreakpoint, l,
         responsiveSettings = _.options.responsive || null;
 
-    if ( $.type(responsiveSettings) === "array" && responsiveSettings.length ) {
+    if ( $.type(responsiveSettings) === 'array' && responsiveSettings.length ) {
 
       _.respondTo = _.options.respondTo || 'window';
 
@@ -1637,6 +1809,8 @@
     _.buildDots();
     _.updateDots();
     _.initDotEvents();
+    _.cleanUpSlideEvents();
+    _.initSlideEvents();
 
     _.checkResponsive(false, true);
 
@@ -1644,15 +1818,15 @@
       $(_.$slideTrack).children().on('click.slick', _.selectHandler);
     }
 
-    _.setSlideClasses(0);
+    _.setSlideClasses(typeof _.currentSlide === 'number' ? _.currentSlide : 0);
 
     _.setPosition();
+    _.focusHandler();
 
-    _.$slider.trigger('reInit', [_]);
+    _.paused = !_.options.autoplay;
+    _.autoPlay();
 
-    if (_.options.autoplay === true) {
-      _.focusHandler();
-    }
+    _.$slider.trigger('reInit', [_]);
 
   };
 
@@ -1817,36 +1991,103 @@
 
   };
 
-  Slick.prototype.setOption = Slick.prototype.slickSetOption = function(option, value, refresh) {
+  Slick.prototype.setOption =
+      Slick.prototype.slickSetOption = function() {
 
-    var _ = this, l, item;
+        /**
+         * accepts arguments in format of:
+         *
+         *  - for changing a single option's value:
+         *     .slick("setOption", option, value, refresh )
+         *
+         *  - for changing a set of responsive options:
+         *     .slick("setOption", 'responsive', [{}, ...], refresh )
+         *
+         *  - for updating multiple values at once (not responsive)
+         *     .slick("setOption", { 'option': value, ... }, refresh )
+         */
+
+        var _ = this, l, item, option, value, refresh = false, type;
+
+        if( $.type( arguments[0] ) === 'object' ) {
+
+          option =  arguments[0];
+          refresh = arguments[1];
+          type = 'multiple';
+
+        } else if ( $.type( arguments[0] ) === 'string' ) {
+
+          option =  arguments[0];
+          value = arguments[1];
+          refresh = arguments[2];
+
+          if ( arguments[0] === 'responsive' && $.type( arguments[1] ) === 'array' ) {
+
+            type = 'responsive';
+
+          } else if ( typeof arguments[1] !== 'undefined' ) {
+
+            type = 'single';
+
+          }
+
+        }
+
+        if ( type === 'single' ) {
+
+          _.options[option] = value;
+
+
+        } else if ( type === 'multiple' ) {
+
+          $.each( option , function( opt, val ) {
+
+            _.options[opt] = val;
+
+          });
+
+
+        } else if ( type === 'responsive' ) {
+
+          for ( item in value ) {
+
+            if( $.type( _.options.responsive ) !== 'array' ) {
+
+              _.options.responsive = [ value[item] ];
+
+            } else {
+
+              l = _.options.responsive.length-1;
+
+              // loop through the responsive object and splice out duplicates.
+              while( l >= 0 ) {
+
+                if( _.options.responsive[l].breakpoint === value[item].breakpoint ) {
+
+                  _.options.responsive.splice(l,1);
+
+                }
+
+                l--;
+
+              }
+
+              _.options.responsive.push( value[item] );
 
-    if( option === "responsive" && $.type(value) === "array" ) {
-      for ( item in value ) {
-        if( $.type( _.options.responsive ) !== "array" ) {
-          _.options.responsive = [ value[item] ];
-        } else {
-          l = _.options.responsive.length-1;
-          // loop through the responsive object and splice out duplicates.
-          while( l >= 0 ) {
-            if( _.options.responsive[l].breakpoint === value[item].breakpoint ) {
-              _.options.responsive.splice(l,1);
             }
-            l--;
+
           }
-          _.options.responsive.push( value[item] );
+
         }
-      }
-    } else {
-      _.options[option] = value;
-    }
 
-    if (refresh === true) {
-      _.unload();
-      _.reinit();
-    }
+        if ( refresh ) {
 
-  };
+          _.unload();
+          _.reinit();
+
+        }
+
+      };
 
   Slick.prototype.setPosition = function() {
 
@@ -2077,18 +2318,15 @@
 
   };
 
-  Slick.prototype.setPaused = function(paused) {
+  Slick.prototype.interrupt = function( toggle ) {
 
     var _ = this;
 
-    if (_.options.autoplay === true && _.options.pauseOnHover === true) {
-      _.paused = paused;
-      if (!paused) {
-        _.autoPlay();
-      } else {
-        _.autoPlayClear();
-      }
+    if( !toggle ) {
+      _.autoPlay();
     }
+    _.interrupted = toggle;
+
   };
 
   Slick.prototype.selectHandler = function(event) {
@@ -2119,7 +2357,7 @@
   Slick.prototype.slideHandler = function(index, sync, dontAnimate) {
 
     var targetSlide, animSlide, oldSlide, slideLeft, targetLeft = null,
-        _ = this;
+        _ = this, navTarget;
 
     sync = sync || false;
 
@@ -2171,7 +2409,7 @@
       return;
     }
 
-    if (_.options.autoplay === true) {
+    if ( _.options.autoplay ) {
       clearInterval(_.autoPlayTimer);
     }
 
@@ -2200,6 +2438,17 @@
 
     _.setSlideClasses(_.currentSlide);
 
+    if ( _.options.asNavFor ) {
+
+      navTarget = _.getNavTarget();
+      navTarget = navTarget.slick('getSlick');
+
+      if ( navTarget.slideCount <= navTarget.options.slidesToShow ) {
+        navTarget.setSlideClasses(_.currentSlide);
+      }
+
+    }
+
     _.updateDots();
     _.updateArrows();
 
@@ -2274,9 +2523,9 @@
     }
     if (_.options.verticalSwiping === true) {
       if ((swipeAngle >= 35) && (swipeAngle <= 135)) {
-        return 'left';
+        return 'down';
       } else {
-        return 'right';
+        return 'up';
       }
     }
 
@@ -2287,44 +2536,73 @@
   Slick.prototype.swipeEnd = function(event) {
 
     var _ = this,
-        slideCount;
+        slideCount,
+        direction;
 
     _.dragging = false;
+    _.interrupted = false;
+    _.shouldClick = ( _.touchObject.swipeLength > 10 ) ? false : true;
 
-    _.shouldClick = (_.touchObject.swipeLength > 10) ? false : true;
-
-    if (_.touchObject.curX === undefined) {
+    if ( _.touchObject.curX === undefined ) {
       return false;
     }
 
-    if (_.touchObject.edgeHit === true) {
-      _.$slider.trigger('edge', [_, _.swipeDirection()]);
+    if ( _.touchObject.edgeHit === true ) {
+      _.$slider.trigger('edge', [_, _.swipeDirection() ]);
     }
 
-    if (_.touchObject.swipeLength >= _.touchObject.minSwipe) {
+    if ( _.touchObject.swipeLength >= _.touchObject.minSwipe ) {
+
+      direction = _.swipeDirection();
+
+      switch ( direction ) {
 
-      switch (_.swipeDirection()) {
         case 'left':
-          slideCount = _.options.swipeToSlide ? _.checkNavigable(_.currentSlide + _.getSlideCount()) : _.currentSlide + _.getSlideCount();
-          _.slideHandler(slideCount);
+        case 'down':
+
+          slideCount =
+              _.options.swipeToSlide ?
+                  _.checkNavigable( _.currentSlide + _.getSlideCount() ) :
+              _.currentSlide + _.getSlideCount();
+
           _.currentDirection = 0;
-          _.touchObject = {};
-          _.$slider.trigger('swipe', [_, 'left']);
+
           break;
 
         case 'right':
-          slideCount = _.options.swipeToSlide ? _.checkNavigable(_.currentSlide - _.getSlideCount()) : _.currentSlide - _.getSlideCount();
-          _.slideHandler(slideCount);
+        case 'up':
+
+          slideCount =
+              _.options.swipeToSlide ?
+                  _.checkNavigable( _.currentSlide - _.getSlideCount() ) :
+              _.currentSlide - _.getSlideCount();
+
           _.currentDirection = 1;
-          _.touchObject = {};
-          _.$slider.trigger('swipe', [_, 'right']);
+
           break;
+
+        default:
+
+
       }
+
+      if( direction != 'vertical' ) {
+
+        _.slideHandler( slideCount );
+        _.touchObject = {};
+        _.$slider.trigger('swipe', [_, direction ]);
+
+      }
+
     } else {
-      if (_.touchObject.startX !== _.touchObject.curX) {
-        _.slideHandler(_.currentSlide);
+
+      if ( _.touchObject.startX !== _.touchObject.curX ) {
+
+        _.slideHandler( _.currentSlide );
         _.touchObject = {};
+
       }
+
     }
 
   };
@@ -2447,6 +2725,8 @@
     var _ = this,
         touches;
 
+    _.interrupted = true;
+
     if (_.touchObject.fingerCount !== 1 || _.slideCount <= _.options.slidesToShow) {
       _.touchObject = {};
       return false;
@@ -2574,80 +2854,20 @@
 
     var _ = this;
 
-    if (document[_.hidden]) {
-      _.paused = true;
-      _.autoPlayClear();
-    } else {
-      if (_.options.autoplay === true) {
-        _.paused = false;
-        _.autoPlay();
-      }
-    }
-
-  };
-  Slick.prototype.initADA = function() {
-    var _ = this;
-    _.$slides.add(_.$slideTrack.find('.slick-cloned')).attr({
-      'aria-hidden': 'true',
-      'tabindex': '-1'
-    }).find('a, input, button, select').attr({
-      'tabindex': '-1'
-    });
-
-    _.$slideTrack.attr('role', 'listbox');
+    if ( _.options.autoplay ) {
 
-    _.$slides.not(_.$slideTrack.find('.slick-cloned')).each(function(i) {
-      $(this).attr({
-        'role': 'option',
-        'aria-describedby': 'slick-slide' + _.instanceUid + i + ''
-      });
-    });
+      if ( document[_.hidden] ) {
 
-    if (_.$dots !== null) {
-      _.$dots.attr('role', 'tablist').find('li').each(function(i) {
-            $(this).attr({
-              'role': 'presentation',
-              'aria-selected': 'false',
-              'aria-controls': 'navigation' + _.instanceUid + i + '',
-              'id': 'slick-slide' + _.instanceUid + i + ''
-            });
-          })
-          .first().attr('aria-selected', 'true').end()
-          .find('button').attr('role', 'button').end()
-          .closest('div').attr('role', 'toolbar');
-    }
-    _.activateADA();
+        _.interrupted = true;
 
-  };
+      } else {
 
-  Slick.prototype.activateADA = function() {
-    var _ = this;
+        _.interrupted = false;
 
-    _.$slideTrack.find('.slick-active').attr({
-      'aria-hidden': 'false'
-    }).find('a, input, button, select').attr({
-      'tabindex': '0'
-    });
+      }
 
-  };
+    }
 
-  Slick.prototype.focusHandler = function() {
-    var _ = this;
-    _.$slider.on('focus.slick blur.slick', '*', function(event) {
-      event.stopImmediatePropagation();
-      var sf = $(this);
-      setTimeout(function() {
-        if (_.isPlay) {
-          if (sf.is(':focus')) {
-            _.autoPlayClear();
-            _.paused = true;
-          } else {
-            _.paused = false;
-            _.autoPlay();
-          }
-        }
-      }, 0);
-    });
   };
 
   $.fn.slick = function() {

data/lib/jquery-slick-rails/version.rb

@@ -1,3 +1,3 @@
 module JquerySlickRails
-  VERSION = "1.5.9.1"
+  VERSION = "1.6.0.1"
 end

data/test/dummy/log/test.log

@@ -25,3 +25,24 @@ Started GET "/assets/jquery.slick.js" for 127.0.0.1 at 2015-12-02 15:50:13 +0300
 Served asset /jquery.slick.js - 200 OK (3ms)
 Started GET "/assets/jquery.slick.js" for 127.0.0.1 at 2015-12-02 15:50:13 +0300
 Served asset /jquery.slick.js - 200 OK (0ms)
+Started GET "/assets/slick-theme.css" for 127.0.0.1 at 2016-03-25 22:31:57 +0300
+Served asset /slick-theme.css - 200 OK (42ms)
+Started GET "/assets/slick.css" for 127.0.0.1 at 2016-03-25 22:31:57 +0300
+Served asset /slick.css - 200 OK (5ms)
+Started GET "/assets/slick.eot" for 127.0.0.1 at 2016-03-25 22:31:57 +0300
+Served asset /slick.eot - 200 OK (0ms)
+Started GET "/assets/jquery.slick.js" for 127.0.0.1 at 2016-03-25 22:31:57 +0300
+Compiled jquery.slick.js  (2ms)  (pid 5612)
+Served asset /jquery.slick.js - 200 OK (17ms)
+Started GET "/assets/jquery.slick.js" for 127.0.0.1 at 2016-03-25 22:31:57 +0300
+Served asset /jquery.slick.js - 200 OK (0ms)
+Started GET "/assets/slick-theme.css" for 127.0.0.1 at 2016-03-25 22:32:59 +0300
+Served asset /slick-theme.css - 200 OK (1ms)
+Started GET "/assets/slick.css" for 127.0.0.1 at 2016-03-25 22:32:59 +0300
+Served asset /slick.css - 200 OK (0ms)
+Started GET "/assets/slick.eot" for 127.0.0.1 at 2016-03-25 22:32:59 +0300
+Served asset /slick.eot - 200 OK (1ms)
+Started GET "/assets/jquery.slick.js" for 127.0.0.1 at 2016-03-25 22:32:59 +0300
+Served asset /jquery.slick.js - 200 OK (0ms)
+Started GET "/assets/jquery.slick.js" for 127.0.0.1 at 2016-03-25 22:32:59 +0300
+Served asset /jquery.slick.js - 200 OK (0ms)

data/test/integration/navigation_test.rb

@@ -23,6 +23,6 @@ class NavigationTest < ActionDispatch::IntegrationTest
 
   test 'slick response is for the expected version' do
     get '/assets/jquery.slick.js'
-    assert_match(/Version: 1\.5\.9/, @response.body)
+    assert_match(/Version: 1\.6\.0/, @response.body)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jquery-slick-rails
 version: !ruby/object:Gem::Version
-  version: 1.5.9.1
+  version: 1.6.0.1
 platform: ruby
 authors:
 - Ilya Bodrov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-02 00:00:00.000000000 Z
+date: 2016-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.12
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.12
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 description: Integrates Slick carousel, a jQuery plugin by Ken Wheeler, into your
   Rails app.
 email:
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.6.1
 signing_key: 
 specification_version: 4
 summary: Integrates Slick carousel into Rails app.
@@ -153,4 +153,3 @@ test_files:
 - test/integration/navigation_test.rb
 - test/jquery-slick-rails_test.rb
 - test/test_helper.rb
-has_rdoc: