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

use [].concat, not Ox.merge

Browse source
This commit is contained in:
rolux 2012-05-24 09:45:33 +02:00
commit 1c40fb007b
27 changed files with 87 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -204,9 +204,9 @@ Ox.TextList = function(options, self) {
items: self.options.items,
itemWidth: getItemWidth(),
format: self.format, // fixme: not needed, happens in TextList
keys: Ox.merge(self.visibleColumns.map(function(column) {
keys: self.visibleColumns.map(function(column) {
return column.id;
}), self.options.keys),
}).concat(self.options.keys),
max: self.options.max,
min: self.options.min,
pageLength: self.options.pageLength,
@ -268,9 +268,9 @@ Ox.TextList = function(options, self) {
that.$head.$content.empty();
constructHead();
that.$body.options({
keys: Ox.merge(self.visibleColumns.map(function(column) {
keys: self.visibleColumns.map(function(column) {
return column.id;
}), self.options.keys)
}).concat(self.options.keys)
});
that.$body.reloadPages();
}
@ -592,7 +592,7 @@ Ox.TextList = function(options, self) {
value = (
/^color/.test(format.type.toLowerCase()) ? Ox.Theme : Ox
)['format' + Ox.toTitleCase(format.type)].apply(
this, Ox.merge([value], format.args || [])
this, [value].concat(format.args || [])
);
} else {
value = format(value, data);
@ -719,9 +719,9 @@ Ox.TextList = function(options, self) {
width: itemWidth + 'px'
});
that.$body.options({
keys: Ox.merge(self.visibleColumns.map(function(column) {
keys: self.visibleColumns.map(function(column) {
return column.id;
}), self.options.keys)
}).concat(self.options.keys)
});
//that.$body.clearCache();
}