Commit abb3183a by Daniel Bawag

Fixed the refresh bug

parent fb6165ad
...@@ -128,7 +128,11 @@ ...@@ -128,7 +128,11 @@
noConfig.style.display = "block"; noConfig.style.display = "block";
} }
} else { } else {
init(); if (performance.navigation.type == 1) {
refresh();
} else {
init();
}
} }
</script> </script>
<script src="./src/endSession/endSession.js"></script> <script src="./src/endSession/endSession.js"></script>
......
var submitted = false; // var submitted = false;
const form = document.getElementById("fields"); const form = document.getElementById("fields");
const sidebar = document.getElementById("sidebar"); const sidebar = document.getElementById("sidebar");
let closerWindow; let closerWindow;
form.addEventListener('submit', (e)=>{ // form.addEventListener('submit', (e)=>{
submitted = true; // submitted = true;
}) // })
endButton = document.createElement("button"); endButton = document.createElement("button");
endButton.id = "endBtn"; endButton.id = "endBtn";
...@@ -46,7 +46,7 @@ endButton.addEventListener("click", function(){ ...@@ -46,7 +46,7 @@ endButton.addEventListener("click", function(){
sessionStorage.clear(); sessionStorage.clear();
//if form is submitted or fields are blank, delete database //if form is submitted or fields are blank, delete database
if(submitted || checkForm(form)){ if(checkForm(form)){
var DBdeleteRequest = window.indexedDB.deleteDatabase("ImageDatabase"); var DBdeleteRequest = window.indexedDB.deleteDatabase("ImageDatabase");
DBdeleteRequest.addEventListener('blocked', function(e){ DBdeleteRequest.addEventListener('blocked', function(e){
console.log("Database cleared."); console.log("Database cleared.");
......
...@@ -15,6 +15,22 @@ const init = () => { ...@@ -15,6 +15,22 @@ const init = () => {
} }
} }
const refresh = () => {
let started_flag = false;
displayFields("fields");
refreshImage();
window.onkeydown = (key) => {
if (!started_flag) {
if (searchStringInArray(`${key.key}`, keyArray) == true || key.ctrlKey && key.key) {
console.log('Invalid key cannot Start');
} else {
started_flag = true;
startMetricCapture();
}
}
}
}
function searchStringInArray(str, strArray) { function searchStringInArray(str, strArray) {
for (var j = 0; j < strArray.length; j++) { for (var j = 0; j < strArray.length; j++) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment