merge
This commit is contained in:
commit
d5733c2c5d
2 changed files with 5 additions and 2 deletions
|
@ -1370,7 +1370,7 @@ Ox.List = function(options, self) {
|
|||
self.options.items.sort(function(a, b) {
|
||||
var aValue = sort[a.id],
|
||||
bValue = sort[b.id],
|
||||
ret = 0
|
||||
ret = 0;
|
||||
if (aValue < bValue) {
|
||||
ret = operator == '+' ? -1 : 1;
|
||||
} else if (aValue > bValue) {
|
||||
|
|
|
@ -122,6 +122,9 @@ Ox.formatDate <f> Formats a date according to a format string
|
|||
|
||||
Ox.formatDate = function(date, str, utc) {
|
||||
// fixme: date and utc are optional, date can be date, number or string
|
||||
if (date == '') {
|
||||
return '';
|
||||
}
|
||||
date = Ox.makeDate(date);
|
||||
var format = [
|
||||
['%', function() {return '%{%}';}],
|
||||
|
@ -546,4 +549,4 @@ Ox.formatUnit <f> Formats a number with a unit
|
|||
@*/
|
||||
Ox.formatUnit = function(num, str) {
|
||||
return Ox.formatNumber(num, 3) + ' ' + str;
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue