From 44cb5026ac51c0a21cd5521e2d8e53adf96a87c6 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sun, 13 Nov 2016 18:56:37 +0100 Subject: [PATCH 1/2] Setting IRQ plugin to off by default in the WebUI as well --- glances/outputs/static/html/stats.html | 2 +- glances/outputs/static/js/controllers.js | 2 +- glances/outputs/static/js/services/plugins/irq.js | 2 +- glances/outputs/static/public/js/main.min.js | 4 ++-- glances/outputs/static/public/stats.html | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/glances/outputs/static/html/stats.html b/glances/outputs/static/html/stats.html index 6ba09059..e4525806 100644 --- a/glances/outputs/static/html/stats.html +++ b/glances/outputs/static/html/stats.html @@ -51,7 +51,7 @@
-
+
diff --git a/glances/outputs/static/js/controllers.js b/glances/outputs/static/js/controllers.js index 639564ec..691e31cd 100644 --- a/glances/outputs/static/js/controllers.js +++ b/glances/outputs/static/js/controllers.js @@ -113,7 +113,7 @@ glancesApp.controller('statsController', function ($scope, $rootScope, $interval break; case $event.shiftKey && $event.keyCode == keycodes.Q: // Q => Show/hide IRQ - $scope.arguments.disable_irq = !$scope.arguments.disable_irq; + $scope.arguments.enable_irq = !$scope.arguments.enable_irq; break; case !$event.shiftKey && $event.keyCode == keycodes.f: // f => Show/hide filesystem stats diff --git a/glances/outputs/static/js/services/plugins/irq.js b/glances/outputs/static/js/services/plugins/irq.js index 0d22b42d..8e71c8ed 100644 --- a/glances/outputs/static/js/services/plugins/irq.js +++ b/glances/outputs/static/js/services/plugins/irq.js @@ -12,7 +12,7 @@ glancesApp.service('GlancesPluginIrq', function() { var irq = { 'irq_line': IrqData['irq_line'], - 'irq_rate': IrqData['irq_rate'] + 'irq_rate': IrqData['irq_rate'] }; this.irqs.push(irq); diff --git a/glances/outputs/static/public/js/main.min.js b/glances/outputs/static/public/js/main.min.js index 2fb50425..cc1e536a 100644 --- a/glances/outputs/static/public/js/main.min.js +++ b/glances/outputs/static/public/js/main.min.js @@ -142,7 +142,7 @@ glancesApp.controller('statsController', ["$scope", "$rootScope", "$interval", " break; case $event.shiftKey && $event.keyCode == keycodes.Q: // Q => Show/hide IRQ - $scope.arguments.disable_irq = !$scope.arguments.disable_irq; + $scope.arguments.enable_irq = !$scope.arguments.enable_irq; break; case !$event.shiftKey && $event.keyCode == keycodes.f: // f => Show/hide filesystem stats @@ -859,7 +859,7 @@ glancesApp.service('GlancesPluginIrq', function() { var irq = { 'irq_line': IrqData['irq_line'], - 'irq_rate': IrqData['irq_rate'] + 'irq_rate': IrqData['irq_rate'] }; this.irqs.push(irq); diff --git a/glances/outputs/static/public/stats.html b/glances/outputs/static/public/stats.html index 6ba09059..e4525806 100644 --- a/glances/outputs/static/public/stats.html +++ b/glances/outputs/static/public/stats.html @@ -51,7 +51,7 @@
-
+
From c090fb34f84a2e064496a771becd16a0759664c3 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sun, 13 Nov 2016 19:11:28 +0100 Subject: [PATCH 2/2] [WebUI] Fix keycode for the IRQ plugin See commit 9650ce0. --- glances/outputs/static/js/variables.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glances/outputs/static/js/variables.js b/glances/outputs/static/js/variables.js index f6ebe80e..3d9bbd03 100644 --- a/glances/outputs/static/js/variables.js +++ b/glances/outputs/static/js/variables.js @@ -30,5 +30,5 @@ var keycodes = { 'r' : '82', 'q' : '81', 'A' : '65', - 'R' : '82', + 'Q' : '81' }