sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests Activity

add an optional function to textlist columns that maps values to sort values

Browse source
This commit is contained in:
rolux 2011-05-22 15:14:42 +02:00
commit a3c18e57b0
6 changed files with 34 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -45,14 +45,11 @@ Ox.List = function(options, self) {
that = new Ox.Container({}, self)
.defaults({
centered: false,
construct: null,
draggable: false,
format: [],
itemHeight: 16,
items: null,
itemWidth: 16,
keys: [],
max: -1,
@ -1217,16 +1214,18 @@ Ox.List = function(options, self) {
}));
}
function updateSort() {
function updateSort(map) {
var key = self.options.sort[0].key,
operator = self.options.sort[0].operator;
if (self.listLength > 1) {
if (Ox.isArray(self.options.items)) {
self.options.items.sort(function(a, b) {
var ret = 0
if (a[key] < b[key]) {
var aValue = map ? map(a[key]) : a[key],
bValue = map ? map(b[key]) : b[key],
ret = 0
if (aValue < bValue) {
return operator == '+' ? -1 : 1
} else if (a[key] > b[key]) {
} else if (aValue > bValue) {
return operator == '+' ? 1 : -1;
}
return ret;
@ -1468,12 +1467,13 @@ Ox.List = function(options, self) {
(key, operator) -> <f> returns List Element
key <s> key to sort list by
operator <s> +/- sort ascending or descending
map <f> function that maps values to sort values
@*/
that.sortList = function(key, operator) {
that.sortList = function(key, operator, map) {
Ox.print('sortList', key, operator)
if (key != self.options.sort[0].key || operator != self.options.sort[0].operator) {
self.options.sort[0] = {key: key, operator: operator};
updateSort();
updateSort(map);
that.triggerEvent('sort', self.options.sort[0]);
}
return that;

20
source/Ox.UI/js/List/Ox.TextList.js
View file

@ -6,7 +6,17 @@ Ox.TextList <f:Ox.Element> TextList Object
(options) -> <f> TextList Object
(options, self) -> <f> TextList Object
options <o> Options object
columns <a|[]>
columns <[o]|[]>
Fixme: There's probably more...
addable <b>
editable <b>
id <s>
removable <b>
operator <s> default sort operator
sort <f> function that maps values to sort values
title <s>
visible <b>
width <n>
columnsMovable <b|false>
columnsRemovable <b|false>
columnsResizable <b|false>
@ -48,8 +58,6 @@ Ox.TextList = function(options, self) {
.options(options || {})
.addClass('OxTextList');
Ox.print('Ox.TextList self.options', self.options)
self.options.columns.forEach(function(v) { // fixme: can this go into a generic ox.js function?
// fixme: and can't these just remain undefined?
if (Ox.isUndefined(v.align)) {
@ -713,7 +721,11 @@ Ox.TextList = function(options, self) {
toggleSelected(self.options.columns[self.selectedColumn].id);
}
}
that.$body.sortList(self.options.sort[0].key, self.options.sort[0].operator);
that.$body.sortList(
self.options.sort[0].key,
self.options.sort[0].operator,
self.options.columns[self.selectedColumn].sort
);
return that;
};