diff --git a/components/monitoring/os/os.html b/components/monitoring/os/os.html index 1d55e15..4201b9e 100644 --- a/components/monitoring/os/os.html +++ b/components/monitoring/os/os.html @@ -32,6 +32,7 @@ margin-left: auto; font-size: 25px; color: #777; + cursor: not-allowed; animation: spin 1s infinite; } #loading { diff --git a/components/monitoring/os/os.js b/components/monitoring/os/os.js index 4710dde..79e1171 100644 --- a/components/monitoring/os/os.js +++ b/components/monitoring/os/os.js @@ -29,18 +29,19 @@ let osData = si.osInfo(); let versionData = si.versions(); let userData = si.users(); let programData = plistr.getProgs(); -let isRefreshing = true; +let isLoading = true; -function updateAndRefreshData() { - if (isRefreshing) { +function refreshData() { + if (isLoading) { return; } document.querySelector("#search-field").value = ""; searchPrograms(); - isRefreshing = true; + isLoading = true; const refreshButton = document.querySelector("#os-program-refresh-button"); refreshButton.style.color = ""; refreshButton.style.animation = ""; + refreshButton.style.cursor = ""; document.querySelector("#table-head").style.display = "none"; $("#programs-container").empty(); $("#loading").show(); @@ -55,7 +56,7 @@ function initOs() { insertData(); const refreshButton = document.querySelector("#os-program-refresh-button"); refreshButton.onclick = () => { - updateAndRefreshData(); + refreshData(); }; const searchField = document.querySelector("#search-field"); searchField.onkeyup = () => { @@ -85,7 +86,8 @@ function insertData() { $("#programs-container").html(programHtml(data)); refreshButton.style.color = "#000"; refreshButton.style.animation = "none"; - isRefreshing = false; + refreshButton.style.cursor = "pointer"; + isLoading = false; }) .catch(error => { $("#loading").hide(); @@ -93,7 +95,8 @@ function insertData() { $("#programs-container").html(error); refreshButton.style.color = "#000"; refreshButton.style.animation = "none"; - isRefreshing = false; + refreshButton.style.cursor = "pointer"; + isLoading = false; }); } diff --git a/package-lock.json b/package-lock.json index 16b460e..1640a20 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "statuspilatus", - "version": "0.0.1", + "version": "0.2.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index a119a1e..c1c273c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "statuspilatus", - "version": "0.1.0", + "version": "0.2.0", "description": "Monitor your PC like never before!", "main": "app/index.js", "build": {