Display current active tab

ningt · Apr 11, 2016 · 833c6f9 · 833c6f9
1 parent ee340e4
commit 833c6f9
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 20 deletions.
diff --git a/index.html b/index.html
@@ -14,11 +14,11 @@
         <header class="toolbar toolbar-header">
             <div class="toolbar-actions">
                 <div class="btn-group">
-                    <button class="btn btn-default" onclick="switchDisplay('cpu')">
+                    <button id="cpu-btn" class="btn btn-default" onclick="switchDisplay('cpu')">
                         <i class="icon-processorthree"></i>
                         CPU
                     </button>
-                    <button class="btn btn-default" onclick="switchDisplay('mem')">
+                    <button id="mem-btn" class="btn btn-default" onclick="switchDisplay('mem')">
                         <i class="icon-sd"></i>
                         RAM
                     </button>

diff --git a/js/stats.js b/js/stats.js
@@ -127,48 +127,51 @@ function showMemStats() {
 }
 
 var currentDisplay = 'cpu';
-showCpuStats();
+switchDisplay(currentDisplay);
 
 ipc.on('show', function() {
-    if (currentDisplay === 'cpu')
-        showCpuStats();
-    else if (currentDisplay === 'mem')
-        showMemStats();
+    switchDisplay(currentDisplay);
 });
 
 ipc.on('after_hide', function() {
-    exitTopProcs();
+    exitAllMonitors();
 
-    cpu_monitor = null;
-    mem_monitor = null;
     cpu_chart = null;
 });
 
-function exitTopProcs() {
-    if (cpu_monitor)
-        cpu_monitor.emit('exit');
+function exitMonitor(monitor) {
+    if (monitor) {
+        monitor.emit('exit');
+        monitor = null;
+    }
+}
 
-    if (mem_monitor)
-        mem_monitor.emit('exit');
+function exitAllMonitors() {
+    exitMonitor(cpu_monitor);
+    exitMonitor(mem_monitor);
 }
 
 function switchDisplay(display) {
     currentDisplay = display;
 
     if (currentDisplay === 'cpu') {
         showCpuStats();
-        mem_monitor.emit('exit');
-        mem_monitor = null;
+        exitMonitor(mem_monitor);
+
+        document.getElementById('mem-btn').classList.remove('active');
     }
     else if (currentDisplay === 'mem') {
         showMemStats();
-        cpu_monitor.emit('exit');
-        cpu_monitor = null;
+        exitMonitor(cpu_monitor);
+
+        document.getElementById('cpu-btn').classList.remove('active');
     }
+
+    document.getElementById(display + '-btn').classList.add('active');
 }
 
 function quit() {
-    exitTopProcs();
+    exitAllMonitors();
     ipc.send('quit');
 }