diff --git a/resources/js/result-saver.js b/resources/js/result-saver.js index 5ec271c39b8e171b197a4d2a98a30f480bc06f7e..f1112774e1e493832b102869333e06cee7a04b58 100644 --- a/resources/js/result-saver.js +++ b/resources/js/result-saver.js @@ -8,16 +8,26 @@ if (typeof NodeList !== "undefined" && NodeList.prototype && !NodeList.prototype */ results = new Results(); -document.onreadystatechange = () => { - if (document.readyState === 'complete') { - // Add all saved results - results.loadAllResults(); - // Sort all results - results.sortResults(); - // Update the visualization - results.updateResultPageInterface(); +document.addEventListener("DOMContentLoaded", (event) => { + if(document.readyState == 'complete'){ + initResultSaver(); + }else{ + document.onreadystatechange = e => { + if (document.readyState === 'complete') { + initResultSaver(); + } + }; } -}; +}); + +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 diff --git a/resources/js/scriptResultPage.js b/resources/js/scriptResultPage.js index 167a092fc6dff976d369fca4f4b89618e1ced8c9..9f36cef2149b085a5b36b31a2fcc988270812f15 100644 --- a/resources/js/scriptResultPage.js +++ b/resources/js/scriptResultPage.js @@ -1,10 +1,21 @@ -document.onreadystatechange = () => { - if (document.readyState === 'complete') { - botProtection(); - enableFormResetter(); - loadMoreResults(); +document.addEventListener("DOMContentLoaded", (event) => { + if(document.readyState == 'complete'){ + initialize(); + }else{ + document.onreadystatechange = e => { + if (document.readyState == 'complete') { + initialize(); + } + }; } -}; +}); + +function initialize(){ + botProtection(); + enableFormResetter(); + loadMoreResults(); +} + let link, newtab, top; @@ -100,15 +111,16 @@ function loadMoreResults() { if (!data.imagesearch) { var results = document.querySelectorAll(".result:not(.ad)"); var replacement = document.createElement("div"); - replacement.innerHTML = value; + replacement.innerHTML = value.trim(); results[key].parentNode.replaceChild(replacement.firstChild, results[key]); } else { var results = document.querySelectorAll(".image-container > .image"); var replacement = document.createElement("div"); - replacement.innerHTML = value; + replacement.innerHTML = value.trim(); results[key].parentNode.replaceChild(replacement.firstChild, results[key]); } } + botProtection(); } // If there are new results we can add them @@ -121,7 +133,7 @@ function loadMoreResults() { var resultContainer = document.querySelector("#results"); var results = document.querySelectorAll(".result:not(.ad)"); var replacement = document.createElement("div"); - replacement.innerHTML = value; + replacement.innerHTML = value.trim(); if (key == 0) { resultContainer.insertBefore(replacement.firstChild, results[0]); } else if (typeof results[key] != "undefined") { @@ -133,7 +145,7 @@ function loadMoreResults() { var resultContainer = document.querySelector("#results"); var results = document.querySelectorAll(".image-container > .image"); var replacement = document.createElement("div"); - replacement.innerHTML = value; + replacement.innerHTML = value.trim(); if (key == 0) { resultContainer.insertBefore(replacement.firstChild, results[0]); } else if (typeof results[key] != "undefined") { @@ -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) { document.querySelectorAll(".no-results-error").forEach(element => { element.remove();