Skip to content

Commit f9ec8c4

Browse files
committed
Update Swiper to latest
1 parent 2612732 commit f9ec8c4

5 files changed

Lines changed: 18 additions & 8 deletions

File tree

src/core/components/swiper/swiper-class/components/core/core-class.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ class Swiper extends SwiperClass {
158158

159159
// Props
160160
translate: 0,
161+
previousTranslate: 0,
161162
progress: 0,
162163
velocity: 0,
163164
animating: false,

src/core/components/swiper/swiper-class/components/core/slide/slidePrev.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,13 @@ export default function (speed = this.params.speed, runCallbacks = true, interna
1212
swiper._clientLeft = swiper.$wrapperEl[0].clientLeft;
1313
}
1414
const translate = rtlTranslate ? swiper.translate : -swiper.translate;
15-
16-
const normalizedTranslate = translate < 0 ? -Math.floor(Math.abs(translate)) : Math.floor(translate);
17-
const normalizedSnapGrid = snapGrid.map(val => Math.floor(val));
18-
const normalizedSlidesGrid = slidesGrid.map(val => Math.floor(val));
15+
function normalize(val) {
16+
if (val < 0) return -Math.floor(Math.abs(val));
17+
return Math.floor(val);
18+
}
19+
const normalizedTranslate = normalize(translate);
20+
const normalizedSnapGrid = snapGrid.map(val => normalize(val));
21+
const normalizedSlidesGrid = slidesGrid.map(val => normalize(val));
1922

2023
const currentSnap = snapGrid[normalizedSnapGrid.indexOf(normalizedTranslate)];
2124
const prevSnap = snapGrid[normalizedSnapGrid.indexOf(normalizedTranslate) - 1];

src/core/components/swiper/swiper-class/components/core/translate/setTranslate.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export default function (translate, byController) {
2424
if (Support.transforms3d) $wrapperEl.transform(`translate3d(${x}px, ${y}px, ${z}px)`);
2525
else $wrapperEl.transform(`translate(${x}px, ${y}px)`);
2626
}
27-
27+
swiper.previousTranslate = swiper.translate;
2828
swiper.translate = swiper.isHorizontal() ? x : y;
2929

3030
// Check if we need to update progress

src/core/components/swiper/swiper-class/components/core/update/updateSlides.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,11 @@ export default function () {
154154
if (prevSlideSize === 0 && i !== 0) slidePosition = slidePosition - (swiperSize / 2) - spaceBetween;
155155
if (i === 0) slidePosition = slidePosition - (swiperSize / 2) - spaceBetween;
156156
if (Math.abs(slidePosition) < 1 / 1000) slidePosition = 0;
157+
if (params.roundLengths) slidePosition = Math.floor(slidePosition);
157158
if ((index) % params.slidesPerGroup === 0) snapGrid.push(slidePosition);
158159
slidesGrid.push(slidePosition);
159160
} else {
161+
if (params.roundLengths) slidePosition = Math.floor(slidePosition);
160162
if ((index) % params.slidesPerGroup === 0) snapGrid.push(slidePosition);
161163
slidesGrid.push(slidePosition);
162164
slidePosition = slidePosition + slideSize + spaceBetween;
@@ -188,7 +190,9 @@ export default function () {
188190
if (params.centeredSlides) {
189191
newSlidesGrid = [];
190192
for (let i = 0; i < snapGrid.length; i += 1) {
191-
if (snapGrid[i] < swiper.virtualSize + snapGrid[0]) newSlidesGrid.push(snapGrid[i]);
193+
let slidesGridItem = snapGrid[i];
194+
if (params.roundLengths) slidesGridItem = Math.floor(slidesGridItem);
195+
if (snapGrid[i] < swiper.virtualSize + snapGrid[0]) newSlidesGrid.push(slidesGridItem);
192196
}
193197
snapGrid = newSlidesGrid;
194198
}
@@ -198,8 +202,10 @@ export default function () {
198202
if (!params.centeredSlides) {
199203
newSlidesGrid = [];
200204
for (let i = 0; i < snapGrid.length; i += 1) {
205+
let slidesGridItem = snapGrid[i];
206+
if (params.roundLengths) slidesGridItem = Math.floor(slidesGridItem);
201207
if (snapGrid[i] <= swiper.virtualSize - swiperSize) {
202-
newSlidesGrid.push(snapGrid[i]);
208+
newSlidesGrid.push(slidesGridItem);
203209
}
204210
}
205211
snapGrid = newSlidesGrid;

src/core/components/swiper/swiper-class/components/mousewheel/mousewheel.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ const Mousewheel = {
177177
swiper.emit('scroll', e);
178178

179179
// Stop autoplay
180-
if (swiper.params.autoplay && swiper.params.autoplayDisableOnInteraction) swiper.stopAutoplay();
180+
if (swiper.params.autoplay && swiper.params.autoplayDisableOnInteraction) swiper.autoplay.stop();
181181
// Return page scroll on edge positions
182182
if (position === swiper.minTranslate() || position === swiper.maxTranslate()) return true;
183183
}

0 commit comments

Comments
 (0)