Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove html template tag from children #47

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Remove html template tag from children #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6c7dbda
Remove html template tag from children
Teods Jul 8, 2022
65c08ca
remove html template tag from children
Teods Jul 8, 2022
ff74773
Remove html template tag from children
Teods Jul 8, 2022
41846c7
Fix update 1.6.0
Jan 20, 2023
ef9a23e
Fix update 1.6.0
Jan 20, 2023
a44f014
Update swiffy-slider.js
Teods Feb 21, 2023
87864aa
Update swiffy-slider.js
Teods Feb 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/swiffy-slider-extensions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const swiffysliderextensions = function() {

const startingLeftPos = container.scrollLeft;
const mouseDownStartingXPos = e.clientX;
const slideWidth = container.children[0].offsetWidth + parseInt(window.getComputedStyle(container).columnGap);
const slideWidth = this.getSlides(container)[0].offsetWidth + parseInt(window.getComputedStyle(container).columnGap);
const maxLeftPosition = slideWidth * (container.children.length - 1);
const startLeftScroll = container.scrollLeft;
let nextSlideLeftPos = startLeftScroll;
Expand Down Expand Up @@ -65,6 +65,10 @@ const swiffysliderextensions = function() {
});
this.draggingtimer = setTimeout(() => { sliderElement.classList.remove("dragging"); }, 550);
}, { once: true, passive: true });
},

getSlides(sliderElement) {
return Array.from(sliderElement.children).filter(element => element.tagName.toLowerCase() !== "template")
}
};
}();
Expand Down
87 changes: 47 additions & 40 deletions src/swiffy-slider.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,15 @@
background-clip: padding-box;
}

.slider-container>* {
.slider-container>*:not(template) {
/*The slides*/
scroll-snap-align: var(--swiffy-slider-snap-align);
position: relative;
width: 100%;
height: 100%;
}

.slider-item-helper .slider-container>* {
.slider-item-helper .slider-container>*:not(template) {
background-size: cover;
background-color: #e1e1e1;
background-position: 50% 50%;
Expand All @@ -83,11 +83,11 @@
align-items: center;
}

.slider-item-helper:not(.slider-item-ratio) .slider-container>* {
.slider-item-helper:not(.slider-item-ratio) .slider-container>*:not(template) {
min-height: 20rem;
}

.slider-item-ratio .slider-container>*>* {
.slider-item-ratio .slider-container>*:not(template)>* {
position: absolute;
top: 0;
left: 0;
Expand All @@ -96,11 +96,11 @@
object-fit: cover;
}

.slider-item-ratio-contain .slider-container>*>* {
.slider-item-ratio-contain .slider-container>*:not(template)>* {
object-fit: contain;
}

.slider-item-ratio .slider-container>*::after {
.slider-item-ratio .slider-container>*:not(template)::after {
display: block;
padding-top: calc( 100% / (var(--swiffy-slider-item-ratio)));
content: "";
Expand Down Expand Up @@ -162,7 +162,7 @@
margin-bottom: calc(1rem + var(--swiffy-slider-track-height));
}

.slider-indicators>*.active {
.slider-indicators>*:not(template).active {
opacity: 1;
}

Expand All @@ -179,7 +179,7 @@
margin-bottom: 0;
}

.slider-indicators>* {
.slider-indicators>*:not(template) {
box-sizing: content-box;
flex: 0 1 auto;
width: 2rem;
Expand All @@ -193,23 +193,23 @@
transition: opacity .4s ease;
}

.slider-indicators-square.slider-indicators>*,
.slider-indicators-square .slider-indicators>* {
.slider-indicators-square.slider-indicators>*:not(template),
.slider-indicators-square .slider-indicators>*:not(template) {
width: .5rem;
height: .5rem;
border: .4rem solid transparent;
}

.slider-indicators-round.slider-indicators>*,
.slider-indicators-round .slider-indicators>* {
.slider-indicators-round.slider-indicators>*:not(template),
.slider-indicators-round .slider-indicators>*:not(template) {
width: .5rem;
height: .5rem;
border: .4rem solid transparent;
border-radius: 50%;
}

.slider-indicators-highlight.slider-indicators>*.active,
.slider-indicators-highlight .slider-indicators>*.active {
.slider-indicators-highlight.slider-indicators>*:not(template).active,
.slider-indicators-highlight .slider-indicators>*:not(template).active {
border: .33rem solid transparent;
padding: .07rem;
}
Expand Down Expand Up @@ -244,7 +244,9 @@

.slider-nav::after {
content: "";
-webkit-mask: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' fill='%23fff' viewBox='0 0 16 16'><path fill-rule='evenodd' d='M11.354 1.646a.5.5 0 0 1 0 .708L5.707 8l5.647 5.646a.5.5 0 0 1-.708.708l-6-6a.5.5 0 0 1 0-.708l6-6a.5.5 0 0 1 .708 0z'></path></svg>");
mask: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' fill='%23fff' viewBox='0 0 16 16'><path fill-rule='evenodd' d='M11.354 1.646a.5.5 0 0 1 0 .708L5.707 8l5.647 5.646a.5.5 0 0 1-.708.708l-6-6a.5.5 0 0 1 0-.708l6-6a.5.5 0 0 1 .708 0z'></path></svg>");
-webkit-mask-size: cover;
mask-size: cover;
background-color: var(--swiffy-slider-nav-light);
background-origin: content-box;
Expand All @@ -253,18 +255,22 @@
}

.slider-nav-arrow .slider-nav::after {
-webkit-mask: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' fill='%23fff' viewBox='0 0 16 16'><path fill-rule='evenodd' d='M12 8a.5.5 0 0 1-.5.5H5.707l2.147 2.146a.5.5 0 0 1-.708.708l-3-3a.5.5 0 0 1 0-.708l3-3a.5.5 0 1 1 .708.708L5.707 7.5H11.5a.5.5 0 0 1 .5.5z'></path></svg>");
mask: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' fill='%23fff' viewBox='0 0 16 16'><path fill-rule='evenodd' d='M12 8a.5.5 0 0 1-.5.5H5.707l2.147 2.146a.5.5 0 0 1-.708.708l-3-3a.5.5 0 0 1 0-.708l3-3a.5.5 0 1 1 .708.708L5.707 7.5H11.5a.5.5 0 0 1 .5.5z'></path></svg>");
}

.slider-nav-chevron .slider-nav::after {
-webkit-mask: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' fill='%23fff' viewBox='0 0 16 16'><path fill-rule='evenodd' d='M9.224 1.553a.5.5 0 0 1 .223.67L6.56 8l2.888 5.776a.5.5 0 1 1-.894.448l-3-6a.5.5 0 0 1 0-.448l3-6a.5.5 0 0 1 .67-.223z'></path></svg>");
mask: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' fill='%23fff' viewBox='0 0 16 16'><path fill-rule='evenodd' d='M9.224 1.553a.5.5 0 0 1 .223.67L6.56 8l2.888 5.776a.5.5 0 1 1-.894.448l-3-6a.5.5 0 0 1 0-.448l3-6a.5.5 0 0 1 .67-.223z'></path></svg>");
}

.slider-nav-caret .slider-nav::after {
-webkit-mask: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' fill='%23fff' viewBox='0 0 16 16'><path d='M10 12.796V3.204L4.519 8 10 12.796zm-.659.753-5.48-4.796a1 1 0 0 1 0-1.506l5.48-4.796A1 1 0 0 1 11 3.204v9.592a1 1 0 0 1-1.659.753z'></path></svg>");
mask: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' fill='%23fff' viewBox='0 0 16 16'><path d='M10 12.796V3.204L4.519 8 10 12.796zm-.659.753-5.48-4.796a1 1 0 0 1 0-1.506l5.48-4.796A1 1 0 0 1 11 3.204v9.592a1 1 0 0 1-1.659.753z'></path></svg>");
}

.slider-nav-caretfill .slider-nav::after {
-webkit-mask: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' fill='%23fff' viewBox='0 0 16 16'><path d='m3.86 8.753 5.482 4.796c.646.566 1.658.106 1.658-.753V3.204a1 1 0 0 0-1.659-.753l-5.48 4.796a1 1 0 0 0 0 1.506z'></path></svg>");
mask: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' fill='%23fff' viewBox='0 0 16 16'><path d='m3.86 8.753 5.482 4.796c.646.566 1.658.106 1.658-.753V3.204a1 1 0 0 0-1.659-.753l-5.48 4.796a1 1 0 0 0 0 1.506z'></path></svg>");
}

Expand Down Expand Up @@ -314,6 +320,7 @@
}

.slider-nav-round .slider-nav::after {
-webkit-mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' %3E%3Cpath fill-rule='evenodd' d='M15 8a.5.5 0 0 0-.5-.5H2.707l3.147-3.146a.5.5 0 1 0-.708-.708l-4 4a.5.5 0 0 0 0 .708l4 4a.5.5 0 0 0 .708-.708L2.707 8.5H14.5A.5.5 0 0 0 15 8z'%3E%3C/path%3E%3C/svg%3E");
mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' %3E%3Cpath fill-rule='evenodd' d='M15 8a.5.5 0 0 0-.5-.5H2.707l3.147-3.146a.5.5 0 1 0-.708-.708l-4 4a.5.5 0 0 0 0 .708l4 4a.5.5 0 0 0 .708-.708L2.707 8.5H14.5A.5.5 0 0 0 15 8z'%3E%3C/path%3E%3C/svg%3E");
}

Expand Down Expand Up @@ -353,8 +360,8 @@
opacity: 0.6;
}

.slider-indicators-dark.slider-indicators>*,
.slider-indicators-dark .slider-indicators>* {
.slider-indicators-dark.slider-indicators>*:not(template),
.slider-indicators-dark .slider-indicators>*:not(template) {
filter: invert(1);
}

Expand Down Expand Up @@ -428,57 +435,57 @@
.slider-nav-animation.slider-nav-animation-slow {
--swiffy-slider-animation-duration: 1.25s;
}
.slider-nav-animation .slider-container>*>* {
.slider-nav-animation .slider-container>*:not(template)>* {
transition: opacity var(--swiffy-slider-animation-duration) var(--swiffy-slider-animation-timing), transform var(--swiffy-slider-animation-duration) var(--swiffy-slider-animation-timing);
transition-delay: var(--swiffy-slider-animation-delay);
}
.slider-nav-animation .slider-container .slide-visible>* {
transition: opacity var(--swiffy-slider-animation-duration) var(--swiffy-slider-animation-timing), transform var(--swiffy-slider-animation-duration) var(--swiffy-slider-animation-timing);
transition-delay: var(--swiffy-slider-animation-delay);
}
.slider-nav-animation.slider-nav-animation-fadein .slider-container>*>* {
.slider-nav-animation.slider-nav-animation-fadein .slider-container>*:not(template)>* {
opacity: 0.5;
}
.slider-nav-animation.slider-nav-animation-scale .slider-container>*>* {
.slider-nav-animation.slider-nav-animation-scale .slider-container>*:not(template)>* {
transform: scale(.9);
}
.slider-nav-animation.slider-nav-animation-appear .slider-container>*>* {
.slider-nav-animation.slider-nav-animation-appear .slider-container>*:not(template)>* {
opacity: 0.3;
transform: scale(.9);
}
.slider-nav-animation.slider-nav-animation-scaleup .slider-container>*>* {
.slider-nav-animation.slider-nav-animation-scaleup .slider-container>*:not(template)>* {
transform: scale(.25);
}
.slider-nav-animation.slider-nav-animation-zoomout .slider-container>* {
.slider-nav-animation.slider-nav-animation-zoomout .slider-container>*:not(template) {
overflow: hidden;
}
.slider-nav-animation.slider-nav-animation-zoomout .slider-container>*>* {
.slider-nav-animation.slider-nav-animation-zoomout .slider-container>*>*:not(template) {
transform: scale(1.3);
}
.slider-nav-animation.slider-nav-animation-turn .slider-container>*>* {
.slider-nav-animation.slider-nav-animation-turn .slider-container>*>*:not(template) {
transform: rotateY(70deg);
}
.slider-nav-animation.slider-nav-animation-slideup .slider-container>*>* {
.slider-nav-animation.slider-nav-animation-slideup .slider-container>*:not(template)>* {
transform: translateY(60%) scale(.99);
}
.slider-nav-animation.slider-nav-animation-slideup .slider-container {
overflow-y: hidden;
}
.slider-nav-animation .slider-container>*.slide-visible>* {
.slider-nav-animation .slider-container>*:not(template).slide-visible>* {
opacity: 1;
transform: none;
}
}

@media (min-width: 62rem) {
.slider-item-show6:not(.slider-item-snapstart) .slider-container>*,
.slider-item-show4:not(.slider-item-snapstart) .slider-container>*,
.slider-item-show2:not(.slider-item-snapstart) .slider-container>* {
.slider-item-show6:not(.slider-item-snapstart) .slider-container>*:not(template),
.slider-item-show4:not(.slider-item-snapstart) .slider-container>*:not(template),
.slider-item-show2:not(.slider-item-snapstart) .slider-container>*:not(template) {
scroll-snap-align: unset;
}
.slider-item-show6:not(.slider-item-snapstart) .slider-container>*::before,
.slider-item-show4:not(.slider-item-snapstart) .slider-container>*::before,
.slider-item-show2:not(.slider-item-snapstart) .slider-container>*::before {
.slider-item-show6:not(.slider-item-snapstart) .slider-container>*:not(template)::before,
.slider-item-show4:not(.slider-item-snapstart) .slider-container>*:not(template)::before,
.slider-item-show2:not(.slider-item-snapstart) .slider-container>*:not(template)::before {
content: " ";
display: block;
position: absolute;
Expand Down Expand Up @@ -528,10 +535,10 @@
.slider-item-show6.slider-item-reveal .slider-container {
grid-auto-columns: calc(25% - (var(--swiffy-slider-item-gap)/4*3) - .5rem);
}
.slider-item-show6.slider-item-reveal .slider-container>* {
.slider-item-show6.slider-item-reveal .slider-container>*:not(template) {
scroll-snap-align: unset;
}
.slider-item-show6.slider-item-reveal .slider-container>*::before {
.slider-item-show6.slider-item-reveal .slider-container>*:not(template)::before {
content: " ";
display: block;
position: absolute;
Expand Down Expand Up @@ -564,10 +571,10 @@
.slider-nav-outside-expand .slider-nav {
padding: 0;
}
.slider-indicators-square.slider-indicators>*,
.slider-indicators-square .slider-indicators>*,
.slider-indicators-round.slider-indicators>*,
.slider-indicators-round .slider-indicators>* {
.slider-indicators-square.slider-indicators>*:not(template),
.slider-indicators-square .slider-indicators>*:not(template),
.slider-indicators-round.slider-indicators>*:not(template),
.slider-indicators-round .slider-indicators>*:not(template) {
width: .3rem;
height: .3rem;
}
Expand All @@ -578,7 +585,7 @@
.slider-nav-scrollbar .slider-indicators {
margin-bottom: 0rem;
}
.slider-indicators>* {
.slider-indicators>*:not(template) {
width: 1rem;
height: 0.125rem;
border-width: .25rem;
Expand Down Expand Up @@ -609,4 +616,4 @@
.slider-item-nosnap-touch {
--swiffy-slider-snap-align: unset;
}
}
}
24 changes: 16 additions & 8 deletions src/swiffy-slider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ const swiffyslider = function() {
root: sliderElement.querySelector(".slider-container"),
threshold: threshold
});
sliderElement.querySelectorAll(".slider-container>*").forEach(slide => observer.observe(slide));
sliderElement.querySelectorAll(".slider-container>*:not(template)").forEach(slide => observer.observe(slide));
},

slide(sliderElement, next = true) {
const container = sliderElement.querySelector(".slider-container");
const fullpage = sliderElement.classList.contains("slider-nav-page");
const noloop = sliderElement.classList.contains("slider-nav-noloop");
const nodelay = sliderElement.classList.contains("slider-nav-nodelay");
const slides = container.children;
const slides = this.getSlides(container);
const gapWidth = parseInt(window.getComputedStyle(container).columnGap);
const scrollStep = slides[0].offsetWidth + gapWidth;
let scrollLeftPosition = next ?
Expand All @@ -65,18 +65,18 @@ const swiffyslider = function() {

slideToByIndicator() {
const indicator = window.event.target;
const indicatorIndex = Array.from(indicator.parentElement.children).indexOf(indicator);
const indicatorCount = indicator.parentElement.children.length;
const indicatorIndex = this.getIndicators(indicator.parentElement).indexOf(indicator);
const indicatorCount = this.getIndicators(indicator.parentElement).length;
const sliderElement = indicator.closest(".swiffy-slider");
const slideCount = sliderElement.querySelector(".slider-container").children.length;
const slideCount = this.getSlides(sliderElement.querySelector(".slider-container")).length;
const relativeSlideIndex = (slideCount / indicatorCount) * indicatorIndex;
this.slideTo(sliderElement, relativeSlideIndex);
},

slideTo(sliderElement, slideIndex) {
const container = sliderElement.querySelector(".slider-container");
const gapWidth = parseInt(window.getComputedStyle(container).columnGap);
const scrollStep = container.children[0].offsetWidth + gapWidth;
const scrollStep = this.getSlides(container)[0].offsetWidth + gapWidth;
const nodelay = sliderElement.classList.contains("slider-nav-nodelay");
container.scroll({
left: (scrollStep * slideIndex),
Expand Down Expand Up @@ -111,13 +111,21 @@ const swiffyslider = function() {
return autoplayTimer;
},

getSlides(sliderElement) {
return Array.from(sliderElement.children).filter(element => element.tagName.toLowerCase() !== "template")
},

getIndicators(indicator) {
return Array.from(indicator.children).filter(element => element.tagName.toLowerCase() !== "template")
},

handleIndicators(sliderElement) {
if (!sliderElement) return;
const container = sliderElement.querySelector(".slider-container");
const slidingAreaWidth = container.scrollWidth - container.offsetWidth;
const percentSlide = (container.scrollLeft / slidingAreaWidth);
sliderElement.querySelectorAll(".slider-indicators").forEach((scrollIndicatorContainers) => {
let scrollIndicators = scrollIndicatorContainers.children;
let scrollIndicators = this.getIndicators(scrollIndicatorContainers);
let activeIndicator = Math.abs(Math.round((scrollIndicators.length - 1) * percentSlide));
for (let element of scrollIndicators)
element.classList.remove("active");
Expand All @@ -138,4 +146,4 @@ if (!document.currentScript.hasAttribute("data-noinit")) {
}
}
}
}
}