bachir/drupal-quartiersdedemain
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git JS merge bug fix

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi 2025-04-08 17:06:11 +02:00
parent df422a589c
commit 21d1e760d5
3 changed files with 129 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
web/themes/custom/quartiers_de_demain/dist/assets/bundle.js vendored
View File

@ -954,87 +954,87 @@ $(document).ready(function () {
////////////////////////////////////////// //////////////////////////////////////////
/////////// Start script ressources //////////////////////////////// // /////////// Start script ressources ////////////////////////////////
document.addEventListener("DOMContentLoaded", () => { // document.addEventListener("DOMContentLoaded", () => {
const view = document.querySelector(".view"); // const view = document.querySelector(".view");
const elements = Array.from(view.children); // const elements = Array.from(view.children);
let newView = document.createElement("div"); // let newView = document.createElement("div");
newView.classList.add("view"); // newView.classList.add("view");
let group = null; // let group = null;
let groupContent = null; // let groupContent = null;
elements.forEach((el) => { // elements.forEach((el) => {
if (el.tagName === "H3") { // if (el.tagName === "H3") {
if (group) { // if (group) {
newView.appendChild(group); // newView.appendChild(group);
} // }
group = document.createElement("div"); // group = document.createElement("div");
group.classList.add("group"); // group.classList.add("group");
groupContent = document.createElement("div"); // groupContent = document.createElement("div");
groupContent.classList.add("group-content"); // groupContent.classList.add("group-content");
groupContent.appendChild(el); // groupContent.appendChild(el);
group.appendChild(groupContent); // group.appendChild(groupContent);
} else if (el.classList.contains("views-row")) { // } else if (el.classList.contains("views-row")) {
groupContent.appendChild(el); // groupContent.appendChild(el);
} // }
}); // });
if (group) { // if (group) {
newView.appendChild(group); // newView.appendChild(group);
} // }
view.replaceWith(newView); // view.replaceWith(newView);
// Ajouter un bouton "Voir plus" dans chaque groupe // // Ajouter un bouton "Voir plus" dans chaque groupe
document.querySelectorAll(".group").forEach((group) => { // document.querySelectorAll(".group").forEach((group) => {
const rows = group.querySelectorAll(".views-row"); // const rows = group.querySelectorAll(".views-row");
const button = document.createElement("button"); // const button = document.createElement("button");
button.classList.add("toggle-btn"); // button.classList.add("toggle-btn");
button.textContent = "Voir plus de"; // button.textContent = "Voir plus de";
rows.forEach((row, index) => { // rows.forEach((row, index) => {
if (index >= 3) { // if (index >= 3) {
row.classList.add("hidden"); // row.classList.add("hidden");
row.style.maxHeight = "0"; // row.style.maxHeight = "0";
row.style.opacity = "0"; // row.style.opacity = "0";
} // }
}); // });
button.addEventListener("click", () => { // button.addEventListener("click", () => {
const isExpanded = button.textContent === "Voir moins de"; // const isExpanded = button.textContent === "Voir moins de";
const hiddenRows = group.querySelectorAll(".views-row.hidden"); // const hiddenRows = group.querySelectorAll(".views-row.hidden");
if (isExpanded) { // if (isExpanded) {
// Cacher les lignes avec un délai pour l'effet de transition // // Cacher les lignes avec un délai pour l'effet de transition
hiddenRows.forEach((row) => { // hiddenRows.forEach((row) => {
row.style.maxHeight = "0"; // row.style.maxHeight = "0";
row.style.opacity = "0"; // row.style.opacity = "0";
setTimeout(() => row.classList.add("hidden"), 500); // Délai pour la transition // setTimeout(() => row.classList.add("hidden"), 500); // Délai pour la transition
}); // });
} else { // } else {
// Afficher les lignes // // Afficher les lignes
hiddenRows.forEach((row) => { // hiddenRows.forEach((row) => {
row.classList.remove("hidden"); // row.classList.remove("hidden");
row.style.maxHeight = row.scrollHeight + "px"; // row.style.maxHeight = row.scrollHeight + "px";
row.style.opacity = "1"; // row.style.opacity = "1";
}); // });
} // }
button.textContent = isExpanded ? "Voir plus de" : "Voir moins de"; // button.textContent = isExpanded ? "Voir plus de" : "Voir moins de";
}); // });
group.appendChild(button); // group.appendChild(button);
}); // });
}); // });
/////////// end script ressources //////////////////////////////// // /////////// end script ressources ////////////////////////////////
})(jQuery, window); })(jQuery, window);

2
web/themes/custom/quartiers_de_demain/dist/assets/bundle.js.map vendored
View File

File diff suppressed because one or more lines are too long

128
web/themes/custom/quartiers_de_demain/src/assets/js/quartiers_de_demain.js
View File

@ -896,87 +896,87 @@ $(document).ready(function () {
////////////////////////////////////////// //////////////////////////////////////////
/////////// Start script ressources //////////////////////////////// // /////////// Start script ressources ////////////////////////////////
document.addEventListener("DOMContentLoaded", () => { // document.addEventListener("DOMContentLoaded", () => {
const view = document.querySelector(".view"); // const view = document.querySelector(".view");
const elements = Array.from(view.children); // const elements = Array.from(view.children);
let newView = document.createElement("div"); // let newView = document.createElement("div");
newView.classList.add("view"); // newView.classList.add("view");
let group = null; // let group = null;
let groupContent = null; // let groupContent = null;
elements.forEach((el) => { // elements.forEach((el) => {
if (el.tagName === "H3") { // if (el.tagName === "H3") {
if (group) { // if (group) {
newView.appendChild(group); // newView.appendChild(group);
} // }
group = document.createElement("div"); // group = document.createElement("div");
group.classList.add("group"); // group.classList.add("group");
groupContent = document.createElement("div"); // groupContent = document.createElement("div");
groupContent.classList.add("group-content"); // groupContent.classList.add("group-content");
groupContent.appendChild(el); // groupContent.appendChild(el);
group.appendChild(groupContent); // group.appendChild(groupContent);
} else if (el.classList.contains("views-row")) { // } else if (el.classList.contains("views-row")) {
groupContent.appendChild(el); // groupContent.appendChild(el);
} // }
}); // });
if (group) { // if (group) {
newView.appendChild(group); // newView.appendChild(group);
} // }
view.replaceWith(newView); // view.replaceWith(newView);
// Ajouter un bouton "Voir plus" dans chaque groupe // // Ajouter un bouton "Voir plus" dans chaque groupe
document.querySelectorAll(".group").forEach((group) => { // document.querySelectorAll(".group").forEach((group) => {
const rows = group.querySelectorAll(".views-row"); // const rows = group.querySelectorAll(".views-row");
const button = document.createElement("button"); // const button = document.createElement("button");
button.classList.add("toggle-btn"); // button.classList.add("toggle-btn");
button.textContent = "Voir plus de"; // button.textContent = "Voir plus de";
rows.forEach((row, index) => { // rows.forEach((row, index) => {
if (index >= 3) { // if (index >= 3) {
row.classList.add("hidden"); // row.classList.add("hidden");
row.style.maxHeight = "0"; // row.style.maxHeight = "0";
row.style.opacity = "0"; // row.style.opacity = "0";
} // }
}); // });
button.addEventListener("click", () => { // button.addEventListener("click", () => {
const isExpanded = button.textContent === "Voir moins de"; // const isExpanded = button.textContent === "Voir moins de";
const hiddenRows = group.querySelectorAll(".views-row.hidden"); // const hiddenRows = group.querySelectorAll(".views-row.hidden");
if (isExpanded) { // if (isExpanded) {
// Cacher les lignes avec un délai pour l'effet de transition // // Cacher les lignes avec un délai pour l'effet de transition
hiddenRows.forEach((row) => { // hiddenRows.forEach((row) => {
row.style.maxHeight = "0"; // row.style.maxHeight = "0";
row.style.opacity = "0"; // row.style.opacity = "0";
setTimeout(() => row.classList.add("hidden"), 500); // Délai pour la transition // setTimeout(() => row.classList.add("hidden"), 500); // Délai pour la transition
}); // });
} else { // } else {
// Afficher les lignes // // Afficher les lignes
hiddenRows.forEach((row) => { // hiddenRows.forEach((row) => {
row.classList.remove("hidden"); // row.classList.remove("hidden");
row.style.maxHeight = row.scrollHeight + "px"; // row.style.maxHeight = row.scrollHeight + "px";
row.style.opacity = "1"; // row.style.opacity = "1";
}); // });
} // }
button.textContent = isExpanded ? "Voir plus de" : "Voir moins de"; // button.textContent = isExpanded ? "Voir plus de" : "Voir moins de";
}); // });
group.appendChild(button); // group.appendChild(button);
}); // });
}); // });
/////////// end script ressources //////////////////////////////// // /////////// end script ressources ////////////////////////////////
})(jQuery, window); })(jQuery, window);