slick_rails 1.3.11 → 1.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75a32286f08ba88dd517a43bca47213d0f3a928d
-  data.tar.gz: 114afcc790034c552d3f0e3fa2ea1ec5129fd1bd
+  metadata.gz: 1e291662e2aeecbf7be4ffcaf0b69c467b4be96f
+  data.tar.gz: 4b6d851d3adfdfe67d59cbaba248e66deb353b81
 SHA512:
-  metadata.gz: 4490fcfcb246d1569286374dcfe5522bc2ca9ca2a756028da93f70733c473728ddf5fe598c2d7b86d1c2116176a3211f896c4a76acbf3433d1f7f5ef568e6b86
-  data.tar.gz: bb1dd85c23b9e5f4d4bd87f52a3548522a694fb0630ee0cf0ebc37462766d83a15843379c36f320b4e4e0c74c6c631dfb64300a9b1f42f35600c755c2f5d917d
+  metadata.gz: 9a5f54b68a67acdba004abae29d06f8fd82fd4ec77b55232e72ceb310605028c98325e49cb99d95a690352ff6c4a4cc2536f8ed538eaa150b8d249f3d52ffefc
+  data.tar.gz: 64d1db4d511fe1be77a53a07c5d390268491ba6e240dd5feb1125c85f2ea01e48081842a2dfbba1eed88eb79ae37b7cb7f7dce1dcefbe8339f88b892f8c6c495

data/app/assets/javascripts/slick.js

@@ -6,7 +6,7 @@
 |___/_|_|\___|_|\_(_)/ |___/
                    |__/
 
- Version: 1.3.11
+ Version: 1.3.13
   Author: Ken Wheeler
  Website: http://kenwheeler.github.io
     Docs: http://kenwheeler.github.io/slick
@@ -64,6 +64,7 @@
                 fade: false,
                 focusOnSelect: false,
                 infinite: true,
+                initialSlide: 0,
                 lazyLoad: 'ondemand',
                 onBeforeChange: null,
                 onAfterChange: null,
@@ -91,8 +92,9 @@
                 animating: false,
                 dragging: false,
                 autoPlayTimer: null,
-                currentSlide: 0,
+                currentDirection: 0,
                 currentLeft: null,
+                currentSlide: 0,
                 direction: 1,
                 $dots: null,
                 listWidth: null,
@@ -122,6 +124,7 @@
             _.cssTransitions = false;
             _.paused = false;
             _.positionProp = null;
+            _.shouldClick = true;
             _.$slider = $(element);
             _.$slidesCache = null;
             _.transformType = null;
@@ -131,6 +134,8 @@
 
             _.options = $.extend({}, _.defaults, settings);
 
+            _.currentSlide = _.options.initialSlide;
+
             _.originalSettings = _.options;
             responsiveSettings = _.options.responsive || null;
 
@@ -339,7 +344,6 @@
     Slick.prototype.autoPlayClear = function() {
 
         var _ = this;
-
         if (_.autoPlayTimer) {
             clearInterval(_.autoPlayTimer);
         }
@@ -458,9 +462,7 @@
 
         if (_.options.centerMode === true) {
             _.options.slidesToScroll = 1;
-            if (_.options.slidesToShow % 2 === 0) {
-                _.options.slidesToShow = 3;
-            }
+            _.options.slidesToShow = 3;
         }
 
         $('img[data-lazy]', _.$slider).not('[src]').addClass('slick-loading');
@@ -510,14 +512,14 @@
                     if (targetBreakpoint !== _.activeBreakpoint) {
                         _.activeBreakpoint =
                             targetBreakpoint;
-                        _.options = $.extend({}, _.options,
+                        _.options = $.extend({}, _.originalSettings,
                             _.breakpointSettings[
                                 targetBreakpoint]);
                         _.refresh();
                     }
                 } else {
                     _.activeBreakpoint = targetBreakpoint;
-                    _.options = $.extend({}, _.options,
+                    _.options = $.extend({}, _.originalSettings,
                         _.breakpointSettings[
                             targetBreakpoint]);
                     _.refresh();
@@ -525,8 +527,7 @@
             } else {
                 if (_.activeBreakpoint !== null) {
                     _.activeBreakpoint = null;
-                    _.options = $.extend({}, _.options,
-                        _.originalSettings);
+                    _.options = _.originalSettings;
                     _.refresh();
                 }
             }
@@ -574,6 +575,18 @@
 
     };
 
+    Slick.prototype.clickHandler = function(event) {
+
+        var _ = this;
+
+        if(_.shouldClick === false) {
+            event.stopImmediatePropagation();
+            event.stopPropagation();
+            event.preventDefault();
+        }
+
+    }
+
     Slick.prototype.destroy = function() {
 
         var _ = this;
@@ -586,15 +599,28 @@
         if (_.$dots) {
             _.$dots.remove();
         }
-        if (_.$prevArrow) {
+        if (_.$prevArrow && (typeof _.options.prevArrow !== 'object')) {
             _.$prevArrow.remove();
+        }
+        if (_.$nextArrow && (typeof _.options.nextArrow !== 'object')) {
             _.$nextArrow.remove();
         }
         if (_.$slides.parent().hasClass('slick-track')) {
             _.$slides.unwrap().unwrap();
         }
+
         _.$slides.removeClass(
-            'slick-slide slick-active slick-visible').css('width', '');
+            'slick-slide slick-active slick-center slick-visible')
+            .removeAttr('index')
+            .css({
+                position: '',
+                left: '',
+                top: '',
+                zIndex: '',
+                opacity: '',
+                width: ''
+            });
+
         _.$slider.removeClass('slick-slider');
         _.$slider.removeClass('slick-initialized');
 
@@ -693,21 +719,9 @@
 
     Slick.prototype.getDotCount = function() {
 
-        var _ = this,
-            breaker = 0,
-            dotCounter = 0,
-            dotCount = 0,
-            dotLimit;
-
-        dotLimit = _.options.infinite === true ? _.slideCount + _.options.slidesToShow - _.options.slidesToScroll : _.slideCount;
-
-        while (breaker < dotLimit) {
-            dotCount++;
-            dotCounter += _.options.slidesToScroll;
-            breaker = dotCounter + _.options.slidesToShow;
-        }
+        var _ = this;
 
-        return dotCount;
+        return Math.ceil(_.slideCount  / _.options.slidesToScroll) - 1;
 
     };
 
@@ -735,11 +749,9 @@
                 }
             }
         } else {
-            if (_.slideCount % _.options.slidesToShow !== 0) {
-                if (slideIndex + _.options.slidesToScroll > _.slideCount && _.slideCount > _.options.slidesToShow) {
-                    _.slideOffset = (_.options.slidesToShow * _.slideWidth) - ((_.slideCount % _.options.slidesToShow) * _.slideWidth);
-                    verticalOffset = ((_.slideCount % _.options.slidesToShow) * verticalHeight);
-                }
+            if(slideIndex + _.options.slidesToShow > _.slideCount) {
+                _.slideOffset = ((slideIndex + _.options.slidesToShow) - _.slideCount) * _.slideWidth;
+                verticalOffset = ((slideIndex + _.options.slidesToShow) - _.slideCount) * verticalHeight;
             }
         }
 
@@ -751,6 +763,7 @@
         if (_.options.centerMode === true && _.options.infinite === true) {
             _.slideOffset += _.slideWidth * Math.floor(_.options.slidesToShow / 2) - _.slideWidth;
         } else if (_.options.centerMode === true) {
+            _.slideOffset = 0;
             _.slideOffset += _.slideWidth * Math.floor(_.options.slidesToShow / 2);
         }
 
@@ -783,6 +796,26 @@
 
     };
 
+    Slick.prototype.getSlideCount = function() {
+
+        var _ = this, slidesTraversed;
+
+        if(_.options.swipeToSlide === true) {
+            var swipedSlide = null;
+            _.$slideTrack.find('.slick-slide').each(function(index, slide){
+                if (slide.offsetLeft + ($(slide).outerWidth() / 2) > (_.swipeLeft * -1)) {
+                    swipedSlide = slide;
+                    return false;
+                }
+            });
+            slidesTraversed = Math.abs($(swipedSlide).attr('index') - _.currentSlide);
+            return slidesTraversed;
+        } else {
+            return _.options.slidesToScroll;
+        }
+
+    };
+
     Slick.prototype.init = function() {
 
         var _ = this;
@@ -831,8 +864,14 @@
 
         if (_.options.dots === true && _.options.pauseOnDotsHover === true && _.options.autoplay === true) {
             $('li', _.$dots)
-                .on('mouseenter.slick', _.autoPlayClear)
-                .on('mouseleave.slick', _.autoPlay);
+                .on('mouseenter.slick', function(){
+                    _.paused = true;
+                    _.autoPlayClear();
+                })
+                .on('mouseleave.slick', function(){
+                    _.paused = false;
+                    _.autoPlay();
+                });
         }
 
     };
@@ -858,9 +897,17 @@
             action: 'end'
         }, _.swipeHandler);
 
+        _.$list.on('click.slick', _.clickHandler.bind(this));
+
         if (_.options.pauseOnHover === true && _.options.autoplay === true) {
-            _.$list.on('mouseenter.slick', _.autoPlayClear);
-            _.$list.on('mouseleave.slick', _.autoPlay);
+            _.$list.on('mouseenter.slick', function(){
+                _.paused = true;
+                _.autoPlayClear();
+            });
+            _.$list.on('mouseleave.slick', function(){
+                _.paused = false;
+                _.autoPlay();
+            });
         }
 
         if(_.options.accessibility === true) {
@@ -887,6 +934,8 @@
             }
         });
 
+        $('*[draggable!=true]', _.$slideTrack).on('dragstart', function(e){ e.preventDefault(); })
+
         $(window).on('load.slick.slick-' + _.instanceUid, _.setPosition);
         $(document).on('ready.slick.slick-' + _.instanceUid, _.setPosition);
 
@@ -1199,11 +1248,12 @@
             _.$slideTrack.width(Math.ceil((_.slideWidth * _.$slideTrack.children('.slick-slide').length)));
 
         } else if (_.options.variableWidth === true) {
-            _.slideWidth = 0;
+            var trackWidth = 0;
+            _.slideWidth = Math.ceil(_.listWidth / _.options.slidesToShow);
             _.$slideTrack.children('.slick-slide').each(function(){
-                _.slideWidth += Math.ceil($(this).outerWidth(true));
+                trackWidth += Math.ceil($(this).outerWidth(true));
             });
-            _.$slideTrack.width(Math.ceil(_.slideWidth) + 1);
+            _.$slideTrack.width(Math.ceil(trackWidth) + 1);
         } else {
             _.slideWidth = Math.ceil(_.listWidth);
             _.$slideTrack.height(Math.ceil((_.$slides.first().outerHeight(true) * _.$slideTrack.children('.slick-slide').length)));
@@ -1221,13 +1271,23 @@
 
         _.$slides.each(function(index, element) {
             targetLeft = (_.slideWidth * index) * -1;
-            $(element).css({
-                position: 'relative',
-                left: targetLeft,
-                top: 0,
-                zIndex: 800,
-                opacity: 0
-            });
+            if (_.options.rtl === true) {
+                $(element).css({
+                    position: 'relative',
+                    right: targetLeft,
+                    top: 0,
+                    zIndex: 800,
+                    opacity: 0
+                });
+            } else {
+                $(element).css({
+                    position: 'relative',
+                    left: targetLeft,
+                    top: 0,
+                    zIndex: 800,
+                    opacity: 0
+                });
+            }
         });
 
         _.$slides.eq(_.currentSlide).css({
@@ -1379,7 +1439,7 @@
         var _ = this,
             i, slideIndex, infiniteCount;
 
-        if (_.options.fade === true || _.options.vertical === true) {
+        if (_.options.fade === true) {
             _.options.centerMode = false;
         }
 
@@ -1425,6 +1485,13 @@
         if(!index) index = 0;
 
         if(_.slideCount <= _.options.slidesToShow){
+            _.$slider.find('.slick-slide').removeClass('slick-active');
+            _.$slides.eq(index).addClass('slick-active');
+            if(_.options.centerMode === true) {
+                _.$slider.find('.slick-slide').removeClass('slick-center');
+                _.$slides.eq(index).addClass('slick-center');
+            }
+            _.asNavFor(index);
             return;
         }
         _.slideHandler(index);
@@ -1439,7 +1506,15 @@
         sync = sync || false;
 
         if (_.animating === true && _.options.waitForAnimate === true) {
-            return false;
+            return;
+        }
+
+        if (_.options.fade === true && _.currentSlide === index) {
+            return;
+        }
+
+        if (_.slideCount <= _.options.slidesToShow) {
+            return;
         }
 
         if (sync === false) {
@@ -1450,18 +1525,18 @@
         targetLeft = _.getLeft(targetSlide);
         slideLeft = _.getLeft(_.currentSlide);
 
-        unevenOffset = _.slideCount % _.options.slidesToScroll !== 0 ? _.options.slidesToScroll : 0;
+        unevenOffset = _.options.slidesToScroll === 1 ? 0 : _.options.slidesToShow - (Math.round(_.slideCount / _.options.slidesToScroll));
 
         _.currentLeft = _.swipeLeft === null ? slideLeft : _.swipeLeft;
 
-        if (_.options.infinite === false && _.options.centerMode === false && (index < 0 || index > (_.slideCount - _.options.slidesToShow + unevenOffset))) {
+        if (_.options.infinite === false && _.options.centerMode === false && (index < 0 || index > _.slideCount - _.options.slidesToShow + unevenOffset)) {
             if(_.options.fade === false) {
                 targetSlide = _.currentSlide;
                 _.animateSlide(slideLeft, function() {
                     _.postSlide(targetSlide);
                 });
             }
-            return false;
+            return;
         } else if (_.options.infinite === false && _.options.centerMode === true && (index < 0 || index > (_.slideCount - _.options.slidesToScroll))) {
             if(_.options.fade === false) {
                 targetSlide = _.currentSlide;
@@ -1469,7 +1544,7 @@
                     _.postSlide(targetSlide);
                 });
             }
-            return false;
+            return;
         }
 
         if (_.options.autoplay === true) {
@@ -1510,7 +1585,7 @@
             _.fadeSlide(oldSlide,animSlide, function() {
                 _.postSlide(animSlide);
             });
-            return false;
+            return;
         }
 
         _.animateSlide(targetLeft, function() {
@@ -1569,37 +1644,28 @@
 
     Slick.prototype.swipeEnd = function(event) {
 
-        var _ = this, slideCount, slidesTraversed, swipeDiff;
+        var _ = this, slideCount;
 
         _.dragging = false;
 
+        _.shouldClick = (_.touchObject.swipeLength > 10) ? false : true;
+
         if (_.touchObject.curX === undefined) {
             return false;
         }
 
         if (_.touchObject.swipeLength >= _.touchObject.minSwipe) {
-            $(event.target).on('click.slick', function(event) {
-                event.stopImmediatePropagation();
-                event.stopPropagation();
-                event.preventDefault();
-                $(event.target).off('click.slick');
-            });
-
-            if(_.options.swipeToSlide === true) {
-                slidesTraversed = Math.round(_.touchObject.swipeLength / _.slideWidth);
-                slideCount = slidesTraversed
-            } else {
-                slideCount = _.options.slidesToScroll;
-            }
 
             switch (_.swipeDirection()) {
                 case 'left':
-                    _.slideHandler(_.currentSlide + slideCount);
+                    _.slideHandler(_.currentSlide + _.getSlideCount());
+                    _.currentDirection = 0;
                     _.touchObject = {};
                     break;
 
                 case 'right':
-                    _.slideHandler(_.currentSlide - slideCount);
+                    _.slideHandler(_.currentSlide - _.getSlideCount());
+                    _.currentDirection = 1;
                     _.touchObject = {};
                     break;
             }
@@ -1653,12 +1719,12 @@
 
         touches = event.originalEvent !== undefined ? event.originalEvent.touches : null;
 
-        curLeft = _.getLeft(_.currentSlide);
-
         if (!_.dragging || touches && touches.length !== 1) {
             return false;
         }
 
+        curLeft = _.getLeft(_.currentSlide);
+
         _.touchObject.curX = touches !== undefined ? touches[0].pageX : event.clientX;
         _.touchObject.curY = touches !== undefined ? touches[0].pageY : event.clientY;
 
@@ -1744,8 +1810,10 @@
         if (_.$dots) {
             _.$dots.remove();
         }
-        if (_.$prevArrow) {
+        if (_.$prevArrow && (typeof _.options.prevArrow !== 'object')) {
             _.$prevArrow.remove();
+        }
+        if (_.$nextArrow && (typeof _.options.nextArrow !== 'object')) {
             _.$nextArrow.remove();
         }
         _.$slides.removeClass(
@@ -1755,7 +1823,9 @@
 
     Slick.prototype.updateArrows = function() {
 
-        var _ = this;
+        var _ = this, centerOffset;
+
+        centerOffset = Math.floor(_.options.slidesToShow / 2)
 
         if (_.options.arrows === true && _.options.infinite !==
             true && _.slideCount > _.options.slidesToShow) {
@@ -1764,7 +1834,10 @@
             if (_.currentSlide === 0) {
                 _.$prevArrow.addClass('slick-disabled');
                 _.$nextArrow.removeClass('slick-disabled');
-            } else if (_.currentSlide >= _.slideCount - _.options.slidesToShow) {
+            } else if (_.currentSlide >= _.slideCount - _.options.slidesToShow && _.options.centerMode === false) {
+                _.$nextArrow.addClass('slick-disabled');
+                _.$prevArrow.removeClass('slick-disabled');
+            } else if (_.currentSlide > _.slideCount - _.options.slidesToShow + centerOffset  && _.options.centerMode === true) {
                 _.$nextArrow.addClass('slick-disabled');
                 _.$prevArrow.removeClass('slick-disabled');
             }

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

@@ -12,9 +12,9 @@ $slick-prev-character: '\2190' !default;
 $slick-next-character: '\2192' !default;
 $slick-dot-character: '\2022' !default;
 $slick-dot-size: 6px !default;
-$opacity-default: .75;
-$opacity-on-hover: 1;
-$opacity-not-active: .25;
+$slick-opacity-default: .75 !default;
+$slick-opacity-on-hover: 1 !default;
+$slick-opacity-not-active: .25 !default;
 
 
 @function slick-image-url($url) {
@@ -72,22 +72,19 @@ $opacity-not-active: .25;
         cursor: hand;
     }
 }
-.slick-slider .slick-list,
-.slick-track,
-.slick-slide,
-.slick-slide img {
+.slick-slider .slick-track {
     -webkit-transform: translate3d(0, 0, 0);
     -moz-transform: translate3d(0, 0, 0);
     -ms-transform: translate3d(0, 0, 0);
     -o-transform: translate3d(0, 0, 0);
     transform: translate3d(0, 0, 0);
 }
+
 .slick-track {
     position: relative;
     left: 0;
     top: 0;
     display: block;
-    zoom: 1;
 
     &:before,
     &:after {
@@ -175,11 +172,11 @@ $opacity-not-active: .25;
       background: transparent;
       color: transparent;
       &:before {
-        opacity: $opacity-on-hover;
+        opacity: $slick-opacity-on-hover;
       }
     }
     &.slick-disabled:before {
-        opacity: $opacity-not-active;
+        opacity: $slick-opacity-not-active;
     }
 }
 .slick-prev:before, .slick-next:before {
@@ -187,7 +184,7 @@ $opacity-not-active: .25;
     font-size: 20px;
     line-height: 1;
     color: $slick-arrow-color;
-    opacity: $opacity-default;
+    opacity: $slick-opacity-default;
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;
 }
@@ -256,7 +253,7 @@ $opacity-not-active: .25;
             &:hover, &:focus {
                 outline: none;
                 &:before {
-                  opacity: $opacity-on-hover;
+                  opacity: $slick-opacity-on-hover;
                 }
             }
 
@@ -272,7 +269,7 @@ $opacity-not-active: .25;
                 line-height: 20px;
                 text-align: center;
                 color: $slick-dot-color;
-                opacity: $opacity-not-active;
+                opacity: $slick-opacity-not-active;
                 -webkit-font-smoothing: antialiased;
                 -moz-osx-font-smoothing: grayscale;
             }
@@ -281,7 +278,7 @@ $opacity-not-active: .25;
 
         &.slick-active button:before {
             color: $slick-dot-color-active;
-            opacity: $opacity-default;
+            opacity: $slick-opacity-default;
         }
     }
 }

data/lib/slick_rails/version.rb

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

metadata

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