Merge pull request #1499 from nyusaf/master

Fixes #1498 - includeMargin in outerHeight for vertical slides
kenwheeler · Jul 10, 2015 · 72ec466 · 72ec466
2 parents a684147 + d902600
commit 72ec466
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/slick/slick.js b/slick/slick.js
@@ -570,7 +570,7 @@
                     'width':(100 / _.options.slidesPerRow) + '%',
                     'display': 'inline-block'
                 });
-        
+
         }
 
     };
@@ -1001,7 +1001,7 @@
             targetSlide;
 
         _.slideOffset = 0;
-        verticalHeight = _.$slides.first().outerHeight();
+        verticalHeight = _.$slides.first().outerHeight(true);
 
         if (_.options.infinite === true) {
             if (_.slideCount > _.options.slidesToShow) {
@@ -1516,7 +1516,7 @@
 
         var _ = this;
 
-        _.$slides = 
+        _.$slides =
             _.$slideTrack
                 .children(_.options.slide)
                 .addClass('slick-slide');
@@ -1895,9 +1895,9 @@
 
                 remainder = _.slideCount % _.options.slidesToShow;
                 indexOffset = _.options.infinite === true ? _.options.slidesToShow + index : index;
-                
+
                 if (_.options.slidesToShow == _.options.slidesToScroll && (_.slideCount - index) < _.options.slidesToShow) {
-                    
+
                     allSlides
                         .slice(indexOffset - (_.options.slidesToShow - remainder), indexOffset + remainder)
                         .addClass('slick-active')
@@ -1984,9 +1984,9 @@
 
         var _ = this;
 
-        var targetElement = 
-            $(event.target).is('.slick-slide') ? 
-                $(event.target) : 
+        var targetElement =
+            $(event.target).is('.slick-slide') ?
+                $(event.target) :
                 $(event.target).parents('.slick-slide');
 
         var index = parseInt(targetElement.attr('data-slick-index'));
@@ -1998,7 +1998,7 @@
             _.setSlideClasses(index);
             _.asNavFor(index);
             return;
-            
+
         }
 
         _.slideHandler(index);
@@ -2094,7 +2094,7 @@
 
         if (_.options.fade === true) {
             if (dontAnimate !== true) {
-                
+
                 _.fadeSlideOut(oldSlide);
 
                 _.fadeSlide(animSlide, function() {