git JS merge bug fix
This commit is contained in:
parent
df422a589c
commit
21d1e760d5
@ -954,87 +954,87 @@ $(document).ready(function () {
|
||||
//////////////////////////////////////////
|
||||
|
||||
|
||||
/////////// Start script ressources ////////////////////////////////
|
||||
// /////////// Start script ressources ////////////////////////////////
|
||||
|
||||
document.addEventListener("DOMContentLoaded", () => {
|
||||
const view = document.querySelector(".view");
|
||||
const elements = Array.from(view.children);
|
||||
// document.addEventListener("DOMContentLoaded", () => {
|
||||
// const view = document.querySelector(".view");
|
||||
// const elements = Array.from(view.children);
|
||||
|
||||
let newView = document.createElement("div");
|
||||
newView.classList.add("view");
|
||||
// let newView = document.createElement("div");
|
||||
// newView.classList.add("view");
|
||||
|
||||
let group = null;
|
||||
let groupContent = null;
|
||||
// let group = null;
|
||||
// let groupContent = null;
|
||||
|
||||
elements.forEach((el) => {
|
||||
if (el.tagName === "H3") {
|
||||
if (group) {
|
||||
newView.appendChild(group);
|
||||
}
|
||||
// elements.forEach((el) => {
|
||||
// if (el.tagName === "H3") {
|
||||
// if (group) {
|
||||
// newView.appendChild(group);
|
||||
// }
|
||||
|
||||
group = document.createElement("div");
|
||||
group.classList.add("group");
|
||||
// group = document.createElement("div");
|
||||
// group.classList.add("group");
|
||||
|
||||
groupContent = document.createElement("div");
|
||||
groupContent.classList.add("group-content");
|
||||
// groupContent = document.createElement("div");
|
||||
// groupContent.classList.add("group-content");
|
||||
|
||||
groupContent.appendChild(el);
|
||||
group.appendChild(groupContent);
|
||||
} else if (el.classList.contains("views-row")) {
|
||||
groupContent.appendChild(el);
|
||||
}
|
||||
});
|
||||
// groupContent.appendChild(el);
|
||||
// group.appendChild(groupContent);
|
||||
// } else if (el.classList.contains("views-row")) {
|
||||
// groupContent.appendChild(el);
|
||||
// }
|
||||
// });
|
||||
|
||||
if (group) {
|
||||
newView.appendChild(group);
|
||||
}
|
||||
// if (group) {
|
||||
// newView.appendChild(group);
|
||||
// }
|
||||
|
||||
view.replaceWith(newView);
|
||||
// view.replaceWith(newView);
|
||||
|
||||
// Ajouter un bouton "Voir plus" dans chaque groupe
|
||||
document.querySelectorAll(".group").forEach((group) => {
|
||||
const rows = group.querySelectorAll(".views-row");
|
||||
const button = document.createElement("button");
|
||||
button.classList.add("toggle-btn");
|
||||
button.textContent = "Voir plus de";
|
||||
// // Ajouter un bouton "Voir plus" dans chaque groupe
|
||||
// document.querySelectorAll(".group").forEach((group) => {
|
||||
// const rows = group.querySelectorAll(".views-row");
|
||||
// const button = document.createElement("button");
|
||||
// button.classList.add("toggle-btn");
|
||||
// button.textContent = "Voir plus de";
|
||||
|
||||
rows.forEach((row, index) => {
|
||||
if (index >= 3) {
|
||||
row.classList.add("hidden");
|
||||
row.style.maxHeight = "0";
|
||||
row.style.opacity = "0";
|
||||
}
|
||||
});
|
||||
// rows.forEach((row, index) => {
|
||||
// if (index >= 3) {
|
||||
// row.classList.add("hidden");
|
||||
// row.style.maxHeight = "0";
|
||||
// row.style.opacity = "0";
|
||||
// }
|
||||
// });
|
||||
|
||||
button.addEventListener("click", () => {
|
||||
const isExpanded = button.textContent === "Voir moins de";
|
||||
const hiddenRows = group.querySelectorAll(".views-row.hidden");
|
||||
// button.addEventListener("click", () => {
|
||||
// const isExpanded = button.textContent === "Voir moins de";
|
||||
// const hiddenRows = group.querySelectorAll(".views-row.hidden");
|
||||
|
||||
if (isExpanded) {
|
||||
// Cacher les lignes avec un délai pour l'effet de transition
|
||||
hiddenRows.forEach((row) => {
|
||||
row.style.maxHeight = "0";
|
||||
row.style.opacity = "0";
|
||||
setTimeout(() => row.classList.add("hidden"), 500); // Délai pour la transition
|
||||
});
|
||||
} else {
|
||||
// Afficher les lignes
|
||||
hiddenRows.forEach((row) => {
|
||||
row.classList.remove("hidden");
|
||||
row.style.maxHeight = row.scrollHeight + "px";
|
||||
row.style.opacity = "1";
|
||||
});
|
||||
}
|
||||
// if (isExpanded) {
|
||||
// // Cacher les lignes avec un délai pour l'effet de transition
|
||||
// hiddenRows.forEach((row) => {
|
||||
// row.style.maxHeight = "0";
|
||||
// row.style.opacity = "0";
|
||||
// setTimeout(() => row.classList.add("hidden"), 500); // Délai pour la transition
|
||||
// });
|
||||
// } else {
|
||||
// // Afficher les lignes
|
||||
// hiddenRows.forEach((row) => {
|
||||
// row.classList.remove("hidden");
|
||||
// row.style.maxHeight = row.scrollHeight + "px";
|
||||
// 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);
|
||||
|
||||
|
File diff suppressed because one or more lines are too long
@ -896,87 +896,87 @@ $(document).ready(function () {
|
||||
//////////////////////////////////////////
|
||||
|
||||
|
||||
/////////// Start script ressources ////////////////////////////////
|
||||
// /////////// Start script ressources ////////////////////////////////
|
||||
|
||||
document.addEventListener("DOMContentLoaded", () => {
|
||||
const view = document.querySelector(".view");
|
||||
const elements = Array.from(view.children);
|
||||
// document.addEventListener("DOMContentLoaded", () => {
|
||||
// const view = document.querySelector(".view");
|
||||
// const elements = Array.from(view.children);
|
||||
|
||||
let newView = document.createElement("div");
|
||||
newView.classList.add("view");
|
||||
// let newView = document.createElement("div");
|
||||
// newView.classList.add("view");
|
||||
|
||||
let group = null;
|
||||
let groupContent = null;
|
||||
// let group = null;
|
||||
// let groupContent = null;
|
||||
|
||||
elements.forEach((el) => {
|
||||
if (el.tagName === "H3") {
|
||||
if (group) {
|
||||
newView.appendChild(group);
|
||||
}
|
||||
// elements.forEach((el) => {
|
||||
// if (el.tagName === "H3") {
|
||||
// if (group) {
|
||||
// newView.appendChild(group);
|
||||
// }
|
||||
|
||||
group = document.createElement("div");
|
||||
group.classList.add("group");
|
||||
// group = document.createElement("div");
|
||||
// group.classList.add("group");
|
||||
|
||||
groupContent = document.createElement("div");
|
||||
groupContent.classList.add("group-content");
|
||||
// groupContent = document.createElement("div");
|
||||
// groupContent.classList.add("group-content");
|
||||
|
||||
groupContent.appendChild(el);
|
||||
group.appendChild(groupContent);
|
||||
} else if (el.classList.contains("views-row")) {
|
||||
groupContent.appendChild(el);
|
||||
}
|
||||
});
|
||||
// groupContent.appendChild(el);
|
||||
// group.appendChild(groupContent);
|
||||
// } else if (el.classList.contains("views-row")) {
|
||||
// groupContent.appendChild(el);
|
||||
// }
|
||||
// });
|
||||
|
||||
if (group) {
|
||||
newView.appendChild(group);
|
||||
}
|
||||
// if (group) {
|
||||
// newView.appendChild(group);
|
||||
// }
|
||||
|
||||
view.replaceWith(newView);
|
||||
// view.replaceWith(newView);
|
||||
|
||||
// Ajouter un bouton "Voir plus" dans chaque groupe
|
||||
document.querySelectorAll(".group").forEach((group) => {
|
||||
const rows = group.querySelectorAll(".views-row");
|
||||
const button = document.createElement("button");
|
||||
button.classList.add("toggle-btn");
|
||||
button.textContent = "Voir plus de";
|
||||
// // Ajouter un bouton "Voir plus" dans chaque groupe
|
||||
// document.querySelectorAll(".group").forEach((group) => {
|
||||
// const rows = group.querySelectorAll(".views-row");
|
||||
// const button = document.createElement("button");
|
||||
// button.classList.add("toggle-btn");
|
||||
// button.textContent = "Voir plus de";
|
||||
|
||||
rows.forEach((row, index) => {
|
||||
if (index >= 3) {
|
||||
row.classList.add("hidden");
|
||||
row.style.maxHeight = "0";
|
||||
row.style.opacity = "0";
|
||||
}
|
||||
});
|
||||
// rows.forEach((row, index) => {
|
||||
// if (index >= 3) {
|
||||
// row.classList.add("hidden");
|
||||
// row.style.maxHeight = "0";
|
||||
// row.style.opacity = "0";
|
||||
// }
|
||||
// });
|
||||
|
||||
button.addEventListener("click", () => {
|
||||
const isExpanded = button.textContent === "Voir moins de";
|
||||
const hiddenRows = group.querySelectorAll(".views-row.hidden");
|
||||
// button.addEventListener("click", () => {
|
||||
// const isExpanded = button.textContent === "Voir moins de";
|
||||
// const hiddenRows = group.querySelectorAll(".views-row.hidden");
|
||||
|
||||
if (isExpanded) {
|
||||
// Cacher les lignes avec un délai pour l'effet de transition
|
||||
hiddenRows.forEach((row) => {
|
||||
row.style.maxHeight = "0";
|
||||
row.style.opacity = "0";
|
||||
setTimeout(() => row.classList.add("hidden"), 500); // Délai pour la transition
|
||||
});
|
||||
} else {
|
||||
// Afficher les lignes
|
||||
hiddenRows.forEach((row) => {
|
||||
row.classList.remove("hidden");
|
||||
row.style.maxHeight = row.scrollHeight + "px";
|
||||
row.style.opacity = "1";
|
||||
});
|
||||
}
|
||||
// if (isExpanded) {
|
||||
// // Cacher les lignes avec un délai pour l'effet de transition
|
||||
// hiddenRows.forEach((row) => {
|
||||
// row.style.maxHeight = "0";
|
||||
// row.style.opacity = "0";
|
||||
// setTimeout(() => row.classList.add("hidden"), 500); // Délai pour la transition
|
||||
// });
|
||||
// } else {
|
||||
// // Afficher les lignes
|
||||
// hiddenRows.forEach((row) => {
|
||||
// row.classList.remove("hidden");
|
||||
// row.style.maxHeight = row.scrollHeight + "px";
|
||||
// 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);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user