From da7d8ac70596bc74ca00d6af87312ab3a1a964f8 Mon Sep 17 00:00:00 2001 From: Vadim Date: Sun, 18 Jul 2021 17:37:52 +0300 Subject: [PATCH] Code cleanup --- src/components/Carousel/Carousel.svelte | 7 ++++--- src/components/Progress/Progress.svelte | 3 --- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/components/Carousel/Carousel.svelte b/src/components/Carousel/Carousel.svelte index 32b25dc..0589c37 100644 --- a/src/components/Carousel/Carousel.svelte +++ b/src/components/Carousel/Carousel.svelte @@ -16,6 +16,8 @@ import { ProgressManager } from '../../utils/ProgressManager' import { wait } from '../../utils/interval' + const CLONES_COUNT = 2 + const dispatch = createEventDispatcher() const autoplayDirectionFnDescription = { @@ -112,11 +114,10 @@ $: dispatch('pageChange', originalCurrentPageIndex) let pagesCount = 0 - $: originalPagesCount = Math.max(pagesCount - (infinite ? 2 : 0), 1) // without clones + $: originalPagesCount = Math.max(pagesCount - (infinite ? CLONES_COUNT : 0), 1) // without clones function getOriginalCurrentPageIndex(currentPageIndex, pagesCount, infinite) { if (infinite) { - const CLONES_COUNT = 2 if (currentPageIndex === pagesCount - 1) return 0 if (currentPageIndex === 0) return (pagesCount - CLONES_COUNT) - 1 return currentPageIndex - 1 @@ -235,7 +236,7 @@ let jumped = false if (infinite) { if (currentPageIndex === 0) { - await showPage(pagesCount - 2, { animated: false }) + await showPage(pagesCount - CLONES_COUNT, { animated: false }) jumped = true } else if (currentPageIndex === pagesCount - 1) { await showPage(1, { animated: false }) diff --git a/src/components/Progress/Progress.svelte b/src/components/Progress/Progress.svelte index 0e2efbd..4c26363 100644 --- a/src/components/Progress/Progress.svelte +++ b/src/components/Progress/Progress.svelte @@ -1,7 +1,4 @@