jquery-slick-rails 1.5.0.1 → 1.5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ebaeb0136a4bce24cc1f02bb5c8f85183c3c7b2
-  data.tar.gz: 7af1a0db405357ff7f7fea23d37b7c7edde4da66
+  metadata.gz: bf844109f97c9a2213f98d2c6a1be3d5e1c0820a
+  data.tar.gz: 792dfdb4217c9b053c187b6f7fedac8f6777323f
 SHA512:
-  metadata.gz: ac6e0b9a12aff5bbd348283a348656414c6e39e1ae3a7898f96e05afe0906271f38c3978266be2c814e80b4d590e8b03e89ba0da9d1711a8fd586a34a92e14ab
-  data.tar.gz: 424da8a93f7af5d21ae5194590fd9d8792c768eb42a43dbfe80111501d4760500db9bab8ffaecd03de6cdf3efdcc1ef4a60c924e781fba5b28ae6482d92f30d2
+  metadata.gz: 5ace4ea894bfe40bb0184099cf194e4720098cc4c7aa2431461a11681d63929db49fa58339c3b8f06955c5cd8608633c9118b09a5358db12348daf9fbdd901ba
+  data.tar.gz: 44a10232c1f01460090fd543d5cb14a7a4a77e5b44ce7aecd68c1a1abd181fe629b5b28c10aedf4c58062710471746385f3c4f88d3bd3939573e808a1a90d77a

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

@@ -70,8 +70,10 @@
         pauseOnDotsHover: false,
         respondTo: 'window',
         responsive: null,
+        rows: 1,
         rtl: false,
         slide: '',
+        slidesPerRow: 1,
         slidesToShow: 1,
         slidesToScroll: 1,
         speed: 500,
@@ -82,6 +84,7 @@
         useCSS: true,
         variableWidth: false,
         vertical: false,
+        verticalSwiping: false,
         waitForAnimate: true
       };
 
@@ -108,8 +111,7 @@
         swipeLeft: null,
         $list: null,
         touchObject: {},
-        transformsEnabled: false,
-        verticalScrolling: false
+        transformsEnabled: false
       };
 
       $.extend(_, _.initials);
@@ -124,6 +126,7 @@
       _.paused = false;
       _.positionProp = null;
       _.respondTo = null;
+      _.rowCount = 1;
       _.shouldClick = true;
       _.$slider = $(element);
       _.$slidesCache = null;
@@ -473,8 +476,8 @@
 
     var _ = this;
 
-    _.$slides = _.$slider.children(_.options.slide +
-    ':not(.slick-cloned)').addClass(
+    _.$slides = _.$slider.children(
+        ':not(.slick-cloned)').addClass(
         'slick-slide');
     _.slideCount = _.$slides.length;
 
@@ -520,6 +523,41 @@
 
   };
 
+  Slick.prototype.buildRows = function() {
+
+    var _ = this, a, b, c, newSlides, numOfSlides, originalSlides,slidesPerSection;
+
+    newSlides = document.createDocumentFragment();
+    originalSlides = _.$slider.children();
+
+    if(_.options.rows > 1) {
+      slidesPerSection = _.options.slidesPerRow * _.options.rows;
+      numOfSlides = Math.ceil(
+          originalSlides.length / slidesPerSection
+      );
+
+      for(a = 0; a < numOfSlides; a++){
+        var slide = document.createElement('div');
+        for(b = 0; b < _.options.rows; b++) {
+          var row = document.createElement('div');
+          for(c = 0; c < _.options.slidesPerRow; c++) {
+            var target = (a * slidesPerSection + ((b * _.options.slidesPerRow) + c));
+            if (originalSlides.get(target)) {
+              row.appendChild(originalSlides.get(target));
+            }
+          }
+          slide.appendChild(row);
+        }
+        newSlides.appendChild(slide);
+      };
+      _.$slider.html(newSlides);
+      _.$slider.children().children().children()
+          .width((100 / _.options.slidesPerRow) + "%")
+          .css({'display': 'inline-block'});
+    };
+
+  };
+
   Slick.prototype.checkResponsive = function(initial) {
 
     var _ = this,
@@ -710,6 +748,18 @@
     $(document).off('ready.slick.slick-' + _.instanceUid, _.setPosition);
   };
 
+  Slick.prototype.cleanUpRows = function() {
+
+    var _ = this, originalSlides;
+
+    if(_.options.rows > 1) {
+      originalSlides = _.$slides.children().children();
+      originalSlides.removeAttr('style');
+      _.$slider.html(originalSlides);
+    }
+
+  };
+
   Slick.prototype.clickHandler = function(event) {
 
     var _ = this;
@@ -760,6 +810,8 @@
       _.$slider.html(_.$slides);
     }
 
+    _.cleanUpRows();
+
     _.$slider.removeClass('slick-slider');
     _.$slider.removeClass('slick-initialized');
 
@@ -1028,6 +1080,7 @@
     if (!$(_.$slider).hasClass('slick-initialized')) {
 
       $(_.$slider).addClass('slick-initialized');
+      _.buildRows();
       _.buildOut();
       _.setProps();
       _.startLoad();
@@ -1176,14 +1229,17 @@
     function loadImages(imagesScope) {
       $('img[data-lazy]', imagesScope).each(function() {
         var image = $(this),
-            imageSource = $(this).attr('data-lazy');
+            imageSource = $(this).attr('data-lazy'),
+            imageToLoad = document.createElement('img');
+
+        imageToLoad.onload = function() {
+          image.animate({
+            opacity: 1
+          }, 200);
+        };
+        imageToLoad.src = imageSource;
 
         image
-            .load(function() {
-              image.animate({
-                opacity: 1
-              }, 200);
-            })
             .css({
               opacity: 0
             })
@@ -1361,7 +1417,7 @@
         message: 'index',
         index: currentSlide
       }
-    }, true);
+    }, false);
 
   };
 
@@ -1943,7 +1999,7 @@
     if ((swipeAngle >= 135) && (swipeAngle <= 225)) {
       return (_.options.rtl === false ? 'right' : 'left');
     }
-    if (_.options.verticalScrolling === true) {
+    if (_.options.verticalSwiping === true) {
       if ((swipeAngle >= 35) && (swipeAngle <= 135)) {
         return 'left';
       } else {
@@ -2016,7 +2072,7 @@
     _.touchObject.minSwipe = _.listWidth / _.options
         .touchThreshold;
 
-    if (_.options.verticalScrolling === true) {
+    if (_.options.verticalSwiping === true) {
       _.touchObject.minSwipe = _.listHeight / _.options
           .touchThreshold;
     }
@@ -2059,7 +2115,7 @@
     _.touchObject.swipeLength = Math.round(Math.sqrt(
         Math.pow(_.touchObject.curX - _.touchObject.startX, 2)));
 
-    if (_.options.verticalScrolling === true) {
+    if (_.options.verticalSwiping === true) {
       _.touchObject.swipeLength = Math.round(Math.sqrt(
           Math.pow(_.touchObject.curY - _.touchObject.startY, 2)));
     }
@@ -2075,7 +2131,7 @@
     }
 
     positionOffset = (_.options.rtl === false ? 1 : -1) * (_.touchObject.curX > _.touchObject.startX ? 1 : -1);
-    if (_.options.verticalScrolling === true) {
+    if (_.options.verticalSwiping === true) {
       positionOffset = _.touchObject.curY > _.touchObject.startY ? 1 : -1;
     }
 
@@ -2096,7 +2152,7 @@
     } else {
       _.swipeLeft = curLeft + (swipeLength * (_.$list.height() / _.listWidth)) * positionOffset;
     }
-    if (_.options.verticalScrolling === true) {
+    if (_.options.verticalSwiping === true) {
       _.swipeLeft = curLeft + swipeLength * positionOffset;
     }
 

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

@@ -1,3 +1,3 @@
 module JquerySlickRails
-  VERSION = "1.5.0.1"
+  VERSION = "1.5.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jquery-slick-rails
 version: !ruby/object:Gem::Version
-  version: 1.5.0.1
+  version: 1.5.0.2
 platform: ruby
 authors:
 - Ilya Bodrov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties