Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development

This commit is contained in:
Patrick Jentsch 2020-03-16 16:25:12 +01:00
commit 6414ab36bf

View File

@ -143,7 +143,7 @@
<span class="card-title">Fetching your results!</span> <span class="card-title">Fetching your results!</span>
<div> <div>
<div class="progress"> <div class="progress">
<div class="indeterminate"></div> <div class="indeterminate" id="getting-query-results-bar"></div>
</div> </div>
</div> </div>
</div> </div>
@ -330,38 +330,37 @@
// event triggered on context select change and also if pagination is clicked // event triggered on context select change and also if pagination is clicked
function changeContext(event) { function changeContext(event) {
// newValue = event.target.value; // cannot use this anymore due to reuse of this function in the above paginationElements eventListener // newValue = event.target.value; // cannot use this anymore due to reuse of this function in the above paginationElements eventListener
console.log(event); console.log("Event", event);
if (event.type === "change") { try {
nopaque.toast("Updated context per match!"); if (event.type === "change") {
} nopaque.toast("Updated context per match!");
var contextPerItemElement = document.getElementById("context"); }
newValue = contextPerItemElement.value; } catch (e) {
console.log(newValue); console.log(e);
var lc = document.getElementsByClassName("left-context"); } finally {
var rc = document.getElementsByClassName("right-context"); var contextPerItemElement = document.getElementById("context");
// console.log("LC", lc); newValue = contextPerItemElement.value;
// console.log("RC", rc); console.log(newValue);
for (let element of lc) { var lc = document.getElementsByClassName("left-context");
// console.log(element.childNodes); var rc = document.getElementsByClassName("right-context");
array = Array.from(element.childNodes); for (let element of lc) {
// console.log(array); array = Array.from(element.childNodes);
for (let element of array.slice(newValue)) { for (let element of array.slice(newValue)) {
element.classList.add("hide"); element.classList.add("hide");
} }
for (let element of array.slice(0, newValue)) { for (let element of array.slice(0, newValue)) {
element.classList.remove("hide"); element.classList.remove("hide");
} }
} }
for (let element of rc) { for (let element of rc) {
// console.log(element.childNodes); array = Array.from(element.childNodes);
array = Array.from(element.childNodes); for (let element of array.slice(newValue)) {
// console.log(array); element.classList.add("hide");
for (let element of array.slice(newValue)) { }
element.classList.add("hide"); for (let element of array.slice(0, newValue)) {
} element.classList.remove("hide");
for (let element of array.slice(0, newValue)) { }
element.classList.remove("hide"); }
}
} }
} }
@ -425,7 +424,7 @@
item.elm = resultList.createResultRowElement(item, chunk); item.elm = resultList.createResultRowElement(item, chunk);
} }
resultList.update(); resultList.update();
changeContext(); // sets lr context to current/default value changeContext(); // sets lr context on first result load
}); });
result["loaded_match_count"] += Object.keys(chunk["matches"]).length; result["loaded_match_count"] += Object.keys(chunk["matches"]).length;
console.log("After current match count", result["loaded_match_count"]); console.log("After current match count", result["loaded_match_count"]);