Many WFC related improvements (WIP)
* Update systeminformation to 5.x * More work on WFC display of basic stats -- nearly complete * Disable idle timeout when on WFC
This commit is contained in:
@@ -366,7 +366,7 @@ class StatLog {
|
||||
|
||||
const basicSysInfo = {
|
||||
mem : 'total, free',
|
||||
currentLoad : 'avgload, currentLoad',
|
||||
currentLoad : 'avgLoad, currentLoad',
|
||||
};
|
||||
|
||||
SysInfo.get(basicSysInfo)
|
||||
@@ -380,8 +380,8 @@ class StatLog {
|
||||
|
||||
const loadStats = {
|
||||
// Not avail on BSD, yet.
|
||||
average : _.get(sysInfo, 'currentLoad.avgload', 0),
|
||||
current : _.get(sysInfo, 'currentLoad.currentLoad', 0),
|
||||
average : _.get(sysInfo, 'currentLoad.avgLoad', 0).toFixed(2),
|
||||
current : _.get(sysInfo, 'currentLoad.currentLoad', 0).toFixed(2),
|
||||
};
|
||||
|
||||
this.setNonPersistentSystemStat(SysProps.SystemLoadStats, loadStats);
|
||||
|
||||
@@ -120,7 +120,7 @@ View.prototype.setPosition = function(pos) {
|
||||
//
|
||||
// Allow the following forms: [row, col], { row : r, col : c }, or (row, col)
|
||||
//
|
||||
if(util.isArray(pos)) {
|
||||
if(Array.isArray(pos)) {
|
||||
this.position.row = pos[0];
|
||||
this.position.col = pos[1];
|
||||
} else if(_.isNumber(pos.row) && _.isNumber(pos.col)) {
|
||||
@@ -259,7 +259,7 @@ View.prototype.setFocusProperty = function(focused) {
|
||||
};
|
||||
|
||||
View.prototype.setFocus = function(focused) {
|
||||
// Call separate method to differentiate between a value set as a
|
||||
// Call separate method to differentiate between a value set as a
|
||||
// property vs focus programmatically called.
|
||||
this.setFocusProperty(focused);
|
||||
this.restoreCursor();
|
||||
|
||||
@@ -99,12 +99,18 @@ exports.getModule = class WaitingForCallerModule extends MenuModule {
|
||||
});
|
||||
}
|
||||
|
||||
enter() {
|
||||
this.client.stopIdleMonitor();
|
||||
super.enter();
|
||||
}
|
||||
|
||||
leave() {
|
||||
_.remove(Log.log.streams, stream => {
|
||||
return stream.name === 'wfc-ringbuffer';
|
||||
});
|
||||
|
||||
this._stopRefreshing();
|
||||
this.client.startIdleMonitor();
|
||||
|
||||
super.leave();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user