Skip to content

Commit 77aa8d5

Browse files
committed
Fixed accordion component missing :scope from selector
1 parent 36646e8 commit 77aa8d5

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

public/js/vvvebjs/components-elements.js

+12-9
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,7 @@ Vvveb.Components.add("elements/accordion", {
751751
inline:false,
752752
inputtype: ListInput,
753753
data: {
754-
selector:"> .accordion-item",
754+
selector:":scope > .accordion-item",
755755
container:"",
756756
prefix:"Item ",
757757
name: "text",
@@ -783,14 +783,17 @@ Vvveb.Components.add("elements/accordion", {
783783
Vvveb.Components.render("elements/accordion");
784784
}
785785
if (event.action == "remove") {
786-
node.querySelector("> .accordion-item:nth-child(" + event.index + ")").remove();
786+
node.querySelector(":scope > .accordion-item:nth-child(" + event.index + ")").remove();
787787
} else if (event.action == "select") {
788-
let btn = node.querySelector("> .accordion-item:nth-child(" + event.index + ") .accordion-button", node);
789-
let el = node.querySelector("> .accordion-item:nth-child(" + event.index + ") .collapse", node);
790-
node.querySelector(".accordion-button", node).classList.add("collapsed");
791-
node.querySelector(".collapse", node).classList.remove("show");
788+
let index = (event.index + 1);
789+
let el = node.querySelector(":scope > .accordion-item:nth-child(" + index + ")");
790+
let btn= el.querySelector(".accordion-button");
791+
let collapse = el.querySelector(" .collapse");
792+
793+
node.querySelectorAll(":scope > .accordion-item .collapse").forEach(e => e.classList.remove("show"));
794+
node.querySelectorAll(":scope > .accordion-item .accordion-button").forEach(btn => btn.classList.add("collapsed"));
795+
collapse.classList.add("show");
792796
btn.classList.remove("collapsed");
793-
el.classList.add("show");
794797
//el[0].click();
795798
//Vvveb.Builder.iframe.contentWindow.bootstrap.Collapse.getOrCreateInstance(el[0]).toggle();
796799
}
@@ -1015,12 +1018,12 @@ function carouselAfterDrop(node) {
10151018
let link = document.createElement('link');
10161019
let lib = document.createElement('script');
10171020
let code = document.createElement('script');
1018-
link.href = '../../libs/swiper/swiper-bundle.min.css';
1021+
link.href = '../../js/libs/swiper/swiper-bundle.min.css';
10191022
link.id = 'swiper-css';
10201023
link.rel = 'stylesheet';
10211024
lib.id = 'swiper-js';
10221025
lib.type = 'text/javascript';
1023-
lib.src = '../../libs/swiper/swiper-bundle.min.js';
1026+
lib.src = '../../js/libs/swiper/swiper-bundle.min.js';
10241027
code.type = 'text/javascript';
10251028
code.text = `
10261029
let swiper = [];

0 commit comments

Comments
 (0)