projects
/
project
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9836e94
)
libs/web: add %m pattern to String.format()
author
Jo-Philipp Wich
<jow@openwrt.org>
Sun, 13 Mar 2011 11:12:11 +0000
(11:12 +0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Sun, 13 Mar 2011 11:12:11 +0000
(11:12 +0000)
libs/web/htdocs/luci-static/resources/cbi.js
patch
|
blob
|
history
diff --git
a/libs/web/htdocs/luci-static/resources/cbi.js
b/libs/web/htdocs/luci-static/resources/cbi.js
index
be0a5a8
..
41e7512
100644
(file)
--- a/
libs/web/htdocs/luci-static/resources/cbi.js
+++ b/
libs/web/htdocs/luci-static/resources/cbi.js
@@
-907,7
+907,7
@@
if( ! String.format )
var str = arguments[0];
var out = '';
var str = arguments[0];
var out = '';
- var re = /^(([^%]*)%('.|0|\x20)?(-)?(\d+)?(\.\d+)?(%|b|c|d|u|f|o|s|x|X|q|h|j|t))/;
+ var re = /^(([^%]*)%('.|0|\x20)?(-)?(\d+)?(\.\d+)?(%|b|c|d|u|f|o|s|x|X|q|h|j|t
|m
))/;
var a = b = [], numSubstitutions = 0, numMatches = 0;
while( a = re.exec(str) )
var a = b = [], numSubstitutions = 0, numMatches = 0;
while( a = re.exec(str) )
@@
-1026,6
+1026,20
@@
if( ! String.format )
: String.format('%dh %dm %ds', th, tm, ts);
break;
: String.format('%dh %dm %ds', th, tm, ts);
break;
+
+ case 'm':
+ var mf = pMinLength ? parseInt(pMinLength) : 1000;
+ var pr = pPrecision ? Math.floor(10*parseFloat('0'+pPrecision)) : 2;
+
+ var i = 0;
+ var val = (param || 0);
+ var units = [ '', 'K', 'M', 'G', 'T', 'P', 'E' ];
+
+ for (i = 0; (i < units.length) && (val > mf); i++)
+ val /= mf;
+
+ subst = val.toFixed(pr) + ' ' + units[i];
+ break;
}
}
}
}
}
}