Merge branch '2.3' into 2.4

2019-07-28 21:43:58 +03:00
parent d4b712ae84 918a2964d5
commit a9b01ff4cc
20 changed files with 199 additions and 34 deletions
--- a/maxctrl/lib/common.js
+++ b/maxctrl/lib/common.js
@ -144,7 +144,7 @@ module.exports = function() {
            str = str.replace( /\x1B\[[(?);]{0,2}(;?\d)*./g, '')

            // Trim trailing whitespace that cli-table generates
-            str = str.split(os.EOL).map(s => s.split('\t').map(s => s.trimEnd()).join('\t')).join(os.EOL)
+            str = str.split(os.EOL).map(s => s.split('\t').map(s => s.trim()).join('\t')).join(os.EOL)
        }
        return str
    }