slick_rails 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2650ee2d992b48589f0e1c02640a5e91dd476b63
-  data.tar.gz: ff0b0a8df0c8736228a5d6c6e463c2eed27242b5
+  metadata.gz: fea7a560b5eaa6dc15b7335bb99697f99876f160
+  data.tar.gz: 6a24ac67e2f04271c5acd72e61d3f10a9bfc2cf5
 SHA512:
-  metadata.gz: dbef47e78131d69f702ebc4e9134091ce914abd6206ad6f7669e87ee31679d9968ea6685103a923e08b00a739ec905f5561ea0a0f428e8a9581bb9cb097c6b26
-  data.tar.gz: 4641a43bb4fe3e18dc680f353591948c1462699a10df53faacbba4bde11aa54519018db75600e3380e03824f9693e5dc37ef07f3c8272f3fbf2abc4666356232
+  metadata.gz: 349a37b177339c55f5f1dfc99ab518e77314a0108f6fc46ecf9b8864439bfb7421b270ce98e45d0badb13435495b4fe9a112d2922bca7704d3ac67535d178fca
+  data.tar.gz: 27f8c76d054e7a8933fa69e272e7fcfe6c131ba221549a433869c7795aa667aa99a8c5dd57833849a81ae07f18f73b8aa868e056adf7d1fcb9fb51d4594b6cb2

data/app/assets/javascripts/slick.js

@@ -8,7 +8,7 @@
 
   Author: Ken Wheeler
  Website: http://kenwheeler.github.io
-    Date: 03/23/14
+    Date: 04/02/14
     Docs: http://kenwheeler.github.io/slick
     Repo: http://github.com/kenwheeler/slick
   Issues: http://github.com/kenwheeler/slick/issues
@@ -49,6 +49,7 @@
                 onBeforeChange: null,
                 onAfterChange: null,
                 pauseOnHover: true,
+                placeholders: true,
                 responsive: null,
                 slide: 'div',
                 slidesToShow: 1,
@@ -482,10 +483,10 @@
         if (_.options.arrows === true && _.slideCount > _.options.slidesToShow) {
 
             _.prevArrow = $(
-                '<a href="javascript:void(0)" tabIndex="-1">Previous</a>').appendTo(
+                '<button type="button" tabIndex="-1">Previous</button>').appendTo(
                 _.slider).addClass('slick-prev');
             _.nextArrow = $(
-                '<a href="javascript:void(0)" tabIndex="-1">Next</a>').appendTo(
+                '<button type="button" tabIndex="-1">Next</button>').appendTo(
                 _.slider).addClass('slick-next');
 
             if (_.options.infinite !== true) {
@@ -508,7 +509,10 @@
 
                 dotString += '<li><a href="javascript:void(0)" tabIndex="-1">' + i +
                     '</a></li>';
-
+                if (_.options.placeholders === false && i +
+                _.options.slidesToShow - (_.options.slidesToScroll - 1) > _.slideCount) {
+                    break;
+                }
             }
 
             dotString += "</ul>";
@@ -569,6 +573,11 @@
             _.options.slidesToScroll = 1;
         }
 
+        if(_.options.placeholders === false) {
+            _.options.infinite === false;
+            return false;
+        }
+
         if ((_.slideCount % _.options.slidesToScroll) !==
             0 && _.slideCount > _.options.slidesToShow) {
 
@@ -641,7 +650,9 @@
 
     Slick.prototype.setPosition = function () {
 
-        var _ = this, targetPosition;
+        var _ = this, targetPosition, targetSlide;
+
+        targetSlide = _.currentSlide;
 
         _.setValues();
         _.setDimensions();
@@ -654,12 +665,17 @@
             }
         }
 
+        if (_.options.placeholders === false && _.currentSlide +
+            _.options.slidesToScroll >= _.slideCount) {
+            targetSlide = _.slideCount - _.options.slidesToShow;
+        }
+
         if (_.options.fade === false) {
             if (_.options.vertical === false) {
-                targetPosition = ((_.currentSlide *
+                targetPosition = ((targetSlide *
                         _.slideWidth) * -1) + _.slideOffset;
             } else {
-                targetPosition = ((_.currentSlide *
+                targetPosition = ((targetSlide *
                         _.listHeight) * -1) - _.listHeight;
             }
             _.setCSS(targetPosition);
@@ -828,8 +844,12 @@
             break;
 
         case 'next':
+            if ((_.options.placeholders === false && _.currentSlide +
+                _.options.slidesToShow >= _.slideCount)) {
+                return false;
+            }
             _.slideHandler(_.currentSlide + _.options
-                .slidesToScroll);
+            .slidesToScroll);
             break;
 
         case 'index':
@@ -870,6 +890,10 @@
             ) - _.options.slidesToScroll) {
                 _.nextArrow.addClass('slick-disabled');
                 _.prevArrow.removeClass('slick-disabled');
+            } else if (_.options.placeholders === false && _.currentSlide +
+                _.options.slidesToShow >= _.slideCount) {
+                _.nextArrow.addClass('slick-disabled');
+                _.prevArrow.removeClass('slick-disabled');
             } else {
                 _.prevArrow.removeClass('slick-disabled');
                 _.nextArrow.removeClass('slick-disabled');
@@ -1030,9 +1054,17 @@
         if(_.options.vertical === false) {
             targetLeft = ((targetSlide * _.slideWidth) * -1) + _.slideOffset;
             slideLeft = ((_.currentSlide * _.slideWidth) * -1) + _.slideOffset;
+            if (_.options.placeholders === false && targetSlide +
+            _.options.slidesToShow >= _.slideCount) {
+            targetLeft = (((_.slideCount - _.options.slidesToShow) * _.slideWidth) * -1) + _.slideOffset;
+            }
         } else {
             targetLeft = ((targetSlide * _.listHeight) * -1) - _.listHeight;
             slideLeft = ((_.currentSlide * _.listHeight) * -1) - _.listHeight;
+            if (_.options.placeholders === false && targetSlide +
+            _.options.slidesToShow >= _.slideCount) {
+            targetLeft = (((_.slideCount - _.options.slidesToShow) * _.listHeight) * -1) - _.listHeight;
+            }
         }
 
         if (_.options.infinite === false && (index < 0 || index > (_.slideCount -1))) {
@@ -1053,6 +1085,9 @@
             animSlide = _.slideCount - _.options.slidesToScroll;
         } else if (targetSlide > (_.slideCount - 1)) {
             animSlide = 0;
+        } else if (_.options.placeholders === false && targetSlide +
+            _.options.slidesToShow >= _.slideCount) {
+            animSlide = _.slideCount - _.options.slidesToShow;
         } else {
             animSlide = targetSlide;
         }
@@ -1130,6 +1165,11 @@
                 _.slideOffset : ((_.currentSlide * _.listHeight) * -1) -
                 _.listHeight;
 
+        if (_.options.placeholders === false && _.currentSlide +
+            _.options.slidesToShow >= _.slideCount) {
+            curLeft = (((_.slideCount - _.options.slidesToShow) * _.slideWidth) * -1) + _.slideOffset;
+        }
+
         if((!_.list.hasClass('dragging') && event.data.kind === 'drag') ||
             touches && touches.length !== 1){
             return false;

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

@@ -25,7 +25,7 @@
     }
 
     .slick-loading & {
-        background: #fff url(./ajax-loader.gif) center center no-repeat;
+        background: #fff image-url("ajax-loader.gif") center center no-repeat;
     }
 
     &.dragging {
@@ -75,7 +75,7 @@
     display: none;
 
     &.loading {
-        background: url(./ajax-loader.gif) center center no-repeat;
+        background: image-url("ajax-loader.gif") center center no-repeat;
         position: relative;
     }
 
@@ -101,8 +101,8 @@
  @charset"UTF-8";
  @font-face {
     font-family:"slick";
-    src:url("./fonts/slick.eot");
-    src:url("./fonts/slick.eot?#iefix") format("embedded-opentype"), url("./fonts/slick.woff") format("woff"), url("./fonts/slick.ttf") format("truetype"), url("./fonts/slick.svg#slick") format("svg");
+    src:font-url("slick.eot");
+    src:font-url("slick.eot?#iefix") format("embedded-opentype"), font-url("slick.woff") format("woff"), font-url("slick.ttf") format("truetype"), font-url("slick.svg#slick") format("svg");
     font-weight: normal;
     font-style: normal;
 }
@@ -117,12 +117,15 @@
     width: 20px;
     line-height: 0;
     font-size: 0;
+    cursor: pointer;
+    background: transparent;
     color: transparent;
     top: 50%;
     margin-top: -10px;
     padding: 0;
+    border: none;
     &:focus {
-        outline: none
+        outline: none;
     }
     &.slick-disabled:before {
         opacity: 0.25;
@@ -201,4 +204,4 @@
             opacity: 0.75;
         }
     }
-}
+}

data/lib/slick_rails/version.rb

@@ -1,3 +1,3 @@
 module SlickRails
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

metadata

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