Skip to content

Commit

Permalink
Merge pull request #45 from PilatusDevs/feature/update-all-dependenci…
Browse files Browse the repository at this point in the history
…es-and-release

update all packages and fix some last issues (0.4.0 release)
  • Loading branch information
Jelmerro authored Jan 20, 2019
2 parents 99e4c46 + 43d35e0 commit 3691aed
Show file tree
Hide file tree
Showing 4 changed files with 576 additions and 696 deletions.
5 changes: 4 additions & 1 deletion app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ function createWindow () {
minHeight: 600,
minWidth: 800,
show: false,
icon: path.join(__dirname, "img/logo.png")
icon: path.join(__dirname, "img/logo.png"),
webPreferences: {
nodeIntegration: true
}
});
win.maximize();
win.show();
Expand Down
6 changes: 2 additions & 4 deletions components/processes/processes/processes.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/* global util si */
"use strict";

module.exports = {
Expand All @@ -23,7 +24,6 @@ module.exports = {
activate: activateProcesses
};

let isLoading = true;

function initProcesses(){
const refreshButton = document.querySelector("#processes-refresh-button");
Expand All @@ -41,7 +41,6 @@ function activateProcesses() {
}

function loadCpuProcesses(){
isLoading = true;
const refreshButton = document.querySelector("#processes-refresh-button");
refreshButton.style.color = "";
refreshButton.style.animation = "";
Expand All @@ -50,6 +49,7 @@ function loadCpuProcesses(){
// Do something after the sleep!
si.processes()
.then(data => {
document.getElementById("processes-container").innerHTML = "";
for (let i = 0; i < data.list.length; i++) {
document.getElementById("processes-container").innerHTML += `
<tr>
Expand All @@ -60,10 +60,8 @@ function loadCpuProcesses(){
</tr>`;
}
});
isLoading = false;
refreshButton.style.color = "#000";
refreshButton.style.animation = "none";
refreshButton.style.cursor = "pointer";
});

}
Loading

0 comments on commit 3691aed

Please sign in to comment.