Skip to content
Snippets Groups Projects
Commit e96188ee authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

fixed ready state event

parent d9318cd8
No related branches found
No related tags found
3 merge requests!1895Development,!1823Development,!1822Resolve "Remove Jquery"
...@@ -8,16 +8,26 @@ if (typeof NodeList !== "undefined" && NodeList.prototype && !NodeList.prototype ...@@ -8,16 +8,26 @@ if (typeof NodeList !== "undefined" && NodeList.prototype && !NodeList.prototype
*/ */
results = new Results(); results = new Results();
document.onreadystatechange = () => { document.addEventListener("DOMContentLoaded", (event) => {
if (document.readyState === 'complete') { if(document.readyState == 'complete'){
// Add all saved results initResultSaver();
results.loadAllResults(); }else{
// Sort all results document.onreadystatechange = e => {
results.sortResults(); if (document.readyState === 'complete') {
// Update the visualization initResultSaver();
results.updateResultPageInterface(); }
};
} }
}; });
function initResultSaver() {
// Add all saved results
results.loadAllResults();
// Sort all results
results.sortResults();
// Update the visualization
results.updateResultPageInterface();
}
/** /**
* Load all saved results and sort them * Load all saved results and sort them
......
document.onreadystatechange = () => { document.addEventListener("DOMContentLoaded", (event) => {
if (document.readyState === 'complete') { if(document.readyState == 'complete'){
botProtection(); initialize();
enableFormResetter(); }else{
loadMoreResults(); document.onreadystatechange = e => {
if (document.readyState == 'complete') {
initialize();
}
};
} }
}; });
function initialize(){
botProtection();
enableFormResetter();
loadMoreResults();
}
let link, newtab, top; let link, newtab, top;
...@@ -100,15 +111,16 @@ function loadMoreResults() { ...@@ -100,15 +111,16 @@ function loadMoreResults() {
if (!data.imagesearch) { if (!data.imagesearch) {
var results = document.querySelectorAll(".result:not(.ad)"); var results = document.querySelectorAll(".result:not(.ad)");
var replacement = document.createElement("div"); var replacement = document.createElement("div");
replacement.innerHTML = value; replacement.innerHTML = value.trim();
results[key].parentNode.replaceChild(replacement.firstChild, results[key]); results[key].parentNode.replaceChild(replacement.firstChild, results[key]);
} else { } else {
var results = document.querySelectorAll(".image-container > .image"); var results = document.querySelectorAll(".image-container > .image");
var replacement = document.createElement("div"); var replacement = document.createElement("div");
replacement.innerHTML = value; replacement.innerHTML = value.trim();
results[key].parentNode.replaceChild(replacement.firstChild, results[key]); results[key].parentNode.replaceChild(replacement.firstChild, results[key]);
} }
} }
botProtection();
} }
// If there are new results we can add them // If there are new results we can add them
...@@ -121,7 +133,7 @@ function loadMoreResults() { ...@@ -121,7 +133,7 @@ function loadMoreResults() {
var resultContainer = document.querySelector("#results"); var resultContainer = document.querySelector("#results");
var results = document.querySelectorAll(".result:not(.ad)"); var results = document.querySelectorAll(".result:not(.ad)");
var replacement = document.createElement("div"); var replacement = document.createElement("div");
replacement.innerHTML = value; replacement.innerHTML = value.trim();
if (key == 0) { if (key == 0) {
resultContainer.insertBefore(replacement.firstChild, results[0]); resultContainer.insertBefore(replacement.firstChild, results[0]);
} else if (typeof results[key] != "undefined") { } else if (typeof results[key] != "undefined") {
...@@ -133,7 +145,7 @@ function loadMoreResults() { ...@@ -133,7 +145,7 @@ function loadMoreResults() {
var resultContainer = document.querySelector("#results"); var resultContainer = document.querySelector("#results");
var results = document.querySelectorAll(".image-container > .image"); var results = document.querySelectorAll(".image-container > .image");
var replacement = document.createElement("div"); var replacement = document.createElement("div");
replacement.innerHTML = value; replacement.innerHTML = value.trim();
if (key == 0) { if (key == 0) {
resultContainer.insertBefore(replacement.firstChild, results[0]); resultContainer.insertBefore(replacement.firstChild, results[0]);
} else if (typeof results[key] != "undefined") { } else if (typeof results[key] != "undefined") {
...@@ -143,6 +155,7 @@ function loadMoreResults() { ...@@ -143,6 +155,7 @@ function loadMoreResults() {
} }
} }
} }
botProtection();
if (document.querySelectorAll(".no-results-error").length > 0 && (document.querySelectorAll(".image-container > .image").length > 0) || document.querySelectorAll(".result:not(.ad)").length > 0) { if (document.querySelectorAll(".no-results-error").length > 0 && (document.querySelectorAll(".image-container > .image").length > 0) || document.querySelectorAll(".result:not(.ad)").length > 0) {
document.querySelectorAll(".no-results-error").forEach(element => { document.querySelectorAll(".no-results-error").forEach(element => {
element.remove(); element.remove();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment