Theodor-Springmann-Stiftung/hamann-ausgabe-core
1
0
Fork 0
mirror of https://github.com/Theodor-Springmann-Stiftung/hamann-ausgabe-core.git synced 2025-10-29 17:25:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

SyntaxCheck BUGFIX

Browse Source
This commit is contained in:
Simon Martens
2024-01-31 19:40:35 +01:00
parent b3bd9a8c6d
commit 7f0ca822c3
2 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HaWeb/Views/Admin/Dynamic/XMLState.cshtml
View File

@@ -106,7 +106,7 @@
</div> </div>
<feature name="SyntaxCheck"> <feature name="SyntaxCheck">
@if (Model.ValidState) { @if (Model.ValidState) {
<form class="ha-selectfilesform" asp-controller="API" asp-action="GetSyntaxCheck" onsubmit="GETSyntaxCheck(this);return false;" method="get"> <form class="ha-selectfilesform" asp-controller="API" asp-action="GetSyntaxCheck" onsubmit="GETSyntaxCheck(this);return false;" method="get" hx-boost="false">
<button type="submit" class="ha-scbutton" id="ha-scbutton" > <button type="submit" class="ha-scbutton" id="ha-scbutton" >
Verweise & IDs prüfen Verweise & IDs prüfen
</button> </button>

25
HaWeb/wwwroot/js/marginals.mjs
View File

@@ -14,7 +14,7 @@ const startup_marginals = function () {
return ret; return ret;
}; };
const collapsebox = function (element, height, lineheight, setheight = true) { const collapsebox = function (element, height, lineheight) {
element.style.maxHeight = height + "px"; element.style.maxHeight = height + "px";
element.classList.add("ha-collapsed-box"); element.classList.add("ha-collapsed-box");
element.classList.remove("ha-expanded-box"); element.classList.remove("ha-expanded-box");
@@ -43,16 +43,12 @@ const startup_marginals = function () {
ev.stopPropagation(); ev.stopPropagation();
if (element.classList.contains("ha-collapsed-box")) { if (element.classList.contains("ha-collapsed-box")) {
uncollapsebox(element); uncollapsebox(element);
if (topmove > 0) element.style.bottom = "0px"; if (topmove > 0) element.style.bottom = "5px";
btn.classList.add("ha-close-btn-collapsed-box"); btn.classList.add("ha-close-btn-collapsed-box");
btn.classList.add("ha-collapsed-box-manually-toggled"); btn.classList.add("ha-collapsed-box-manually-toggled");
} else { } else {
if (topmove > 0) { collapsebox(element, height, 0);
collapsebox(element, height, 0, false);
element.style.bottom = "unset";
} else {
collapsebox(element, height, 0, true);
}
btn.classList.remove("ha-close-btn-collapsed-box"); btn.classList.remove("ha-close-btn-collapsed-box");
btn.classList.remove("ha-collapsed-box-manually-toggled"); btn.classList.remove("ha-collapsed-box-manually-toggled");
} }
@@ -66,7 +62,7 @@ const startup_marginals = function () {
timer = setTimeout(function () { timer = setTimeout(function () {
if (element.classList.contains("ha-collapsed-box")) { if (element.classList.contains("ha-collapsed-box")) {
uncollapsebox(element); uncollapsebox(element);
if (topmove > 0) element.style.bottom = "0px"; if (topmove > 0) element.style.bottom = "5px";
btn.classList.add("ha-close-btn-collapsed-box"); btn.classList.add("ha-close-btn-collapsed-box");
} }
}, 80); }, 80);
@@ -81,12 +77,7 @@ const startup_marginals = function () {
element.classList.contains("ha-expanded-box") && element.classList.contains("ha-expanded-box") &&
!btn.classList.contains("ha-collapsed-box-manually-toggled") !btn.classList.contains("ha-collapsed-box-manually-toggled")
) { ) {
if (topmove > 0) { collapsebox(element, height, 0);
collapsebox(element, height, 0, false);
element.style.bottom = "unset";
} else {
collapsebox(element, height, 0, true);
}
btn.classList.remove("ha-close-btn-collapsed-box"); btn.classList.remove("ha-close-btn-collapsed-box");
} }
}); });
@@ -114,6 +105,7 @@ const startup_marginals = function () {
if (thisrect.bottom > containerrect.bottom) { if (thisrect.bottom > containerrect.bottom) {
overlap = thisrect.bottom - containerrect.bottom; overlap = thisrect.bottom - containerrect.bottom;
topmove = thisrect.bottom - containerrect.bottom; topmove = thisrect.bottom - containerrect.bottom;
console.log("topmove", topmove);
} else if (i < boxes.length - 1) { } else if (i < boxes.length - 1) {
let nextrect = boxes[i + 1].getBoundingClientRect(); let nextrect = boxes[i + 1].getBoundingClientRect();
overlap = thisrect.bottom - nextrect.top; overlap = thisrect.bottom - nextrect.top;
@@ -152,8 +144,7 @@ const startup_marginals = function () {
requestAnimationFrame(() => { requestAnimationFrame(() => {
collapsedboxes.push(element); collapsedboxes.push(element);
if (topmove > 0) collapsebox(element, newlength, lineheight, false); collapsebox(element, newlength, lineheight);
else collapsebox(element, newlength, lineheight, true);
addbuttoncaollapsebox(element, newlength, hoverfunction, topmove); addbuttoncaollapsebox(element, newlength, hoverfunction, topmove);
}); });