0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

merge

Browse source
This commit is contained in:
rlx 2011-11-02 15:53:23 +00:00
commit d5733c2c5d
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/Ox.UI/js/List/Ox.List.js
View file

@ -1370,7 +1370,7 @@ Ox.List = function(options, self) {
self.options.items.sort(function(a, b) { self.options.items.sort(function(a, b) {
var aValue = sort[a.id], var aValue = sort[a.id],
bValue = sort[b.id], bValue = sort[b.id],
ret = 0 ret = 0;
if (aValue < bValue) { if (aValue < bValue) {
ret = operator == '+' ? -1 : 1; ret = operator == '+' ? -1 : 1;
} else if (aValue > bValue) { } else if (aValue > bValue) {

3
source/Ox/js/Format.js
View file

@ -122,6 +122,9 @@ Ox.formatDate <f> Formats a date according to a format string
Ox.formatDate = function(date, str, utc) { Ox.formatDate = function(date, str, utc) {
// fixme: date and utc are optional, date can be date, number or string // fixme: date and utc are optional, date can be date, number or string
if (date == '') {
return '';
}
date = Ox.makeDate(date); date = Ox.makeDate(date);
var format = [ var format = [
['%', function() {return '%{%}';}], ['%', function() {return '%{%}';}],