Skip to content

Commit

Permalink
Fixes kenwheeler#1498 - includeMargin in outerHeight for vertical slides
Browse files Browse the repository at this point in the history
  • Loading branch information
Nabila Yusaf committed Jul 1, 2015
1 parent 31f87c6 commit d902600
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions slick/slick.js
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@
'width':(100 / _.options.slidesPerRow) + '%',
'display': 'inline-block'
});

}

};
Expand Down Expand Up @@ -1004,7 +1004,7 @@
targetSlide;

_.slideOffset = 0;
verticalHeight = _.$slides.first().outerHeight();
verticalHeight = _.$slides.first().outerHeight(true);

if (_.options.infinite === true) {
if (_.slideCount > _.options.slidesToShow) {
Expand Down Expand Up @@ -1510,7 +1510,7 @@

var _ = this;

_.$slides =
_.$slides =
_.$slideTrack
.children(_.options.slide)
.addClass('slick-slide');
Expand Down Expand Up @@ -1885,9 +1885,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')
Expand Down Expand Up @@ -1974,9 +1974,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'));
Expand All @@ -1988,7 +1988,7 @@
_.setSlideClasses(index);
_.asNavFor(index);
return;

}

_.slideHandler(index);
Expand Down Expand Up @@ -2084,7 +2084,7 @@

if (_.options.fade === true) {
if (dontAnimate !== true) {

_.fadeSlideOut(oldSlide);

_.fadeSlide(animSlide, function() {
Expand Down

0 comments on commit d902600

Please sign in to comment.