Always use binary byte units

src/js/client.js

@@ -67,6 +67,31 @@ var ROLES = {
 
 var SECRET_PLACEHOLDER = String.fromCharCode(0x25CF).repeat(8);
 
+// ----------------------------------------------
+// Shared Angular Filters
+// ----------------------------------------------
+
+// binary units (non SI) 1024 based
+function prettyByteSize(size, fallback) {
+    if (!size) return fallback || 0;
+
+    var i = Math.floor(Math.log(size) / Math.log(1024));
+    return (size / Math.pow(1024, i)).toFixed(2) * 1 + ' ' + ['B', 'kB', 'MB', 'GB', 'TB'][i];
+};
+
+angular.module('Application').filter('prettyByteSize', function () {
+    return function (size, fallback) { return prettyByteSize(size, fallback) || '0 kb'; }
+});
+
+angular.module('Application').filter('prettyDiskSize', function () {
+    return function (size, fallback) { return prettyByteSize(size, fallback) || 'Not available yet'; }
+});
+
+
+// ----------------------------------------------
+// Cloudron REST API wrapper
+// ----------------------------------------------
+
 angular.module('Application').service('Client', ['$http', '$interval', '$timeout', 'md5', 'Notification', function ($http, $interval, $timeout, md5, Notification) {
     var client = null;
 

src/js/index.js

@@ -278,29 +278,6 @@ app.filter('prettyDomains', function () {
     };
 });
 
-// we use 1024 unit in memory limit in manifest
-app.filter('prettyMemory', function () {
-    return function (memory) {
-        return memory ? Math.floor(memory / 1024 / 1024) : 256;
-    };
-});
-
-// df -H style (si) output
-app.filter('prettyMailSize', function () {
-    return function (size) {
-        if (!size) return '0 kB';
-        var i = Math.floor(Math.log(size) / Math.log(1000));
-        return (size / Math.pow(1000, i)).toFixed(2) * 1 + ' ' + ['B', 'kB', 'MB', 'GB', 'TB'][i]; };
-});
-
-// df -H style (si) output
-app.filter('prettyDiskSize', function () {
-    return function (size) {
-        if (!size) return 'Not available yet';
-        var i = Math.floor(Math.log(size) / Math.log(1000));
-        return (size / Math.pow(1000, i)).toFixed(2) * 1 + ' ' + ['B', 'kB', 'MB', 'GB', 'TB'][i]; };
-});
-
 app.filter('installationActive', function () {
     return function (app) {
         if (app.installationState === ISTATES.ERROR) return false;

src/js/terminal.js

@@ -6,9 +6,9 @@
 /* global ISTATES */
 
 // create main application module
-var app = angular.module('Application', ['angular-md5', 'ui-notification']);
+angular.module('Application', ['angular-md5', 'ui-notification']);
 
-app.controller('TerminalController', ['$scope', '$timeout', '$location', 'Client', function ($scope, $timeout, $location, Client) {
+angular.module('Application').controller('TerminalController', ['$scope', '$timeout', '$location', 'Client', function ($scope, $timeout, $location, Client) {
     var search = decodeURIComponent(window.location.search).slice(1).split('&').map(function (item) { return item.split('='); }).reduce(function (o, k) { o[k[0]] = k[1]; return o; }, {});
 
     $scope.config = Client.getConfig();