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

re-enable synchronous path in Ox.List for Ox.TreeList

Browse source
This commit is contained in:
rolux 2012-04-08 14:17:58 +02:00
parent c3bbf600c9
commit a69970adb6
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -54,6 +54,7 @@ Ox.List = function(options, self) {
self = self || {}; self = self || {};
var that = Ox.Container({}, self) var that = Ox.Container({}, self)
.defaults({ .defaults({
_tree: false,
centered: false, centered: false,
construct: null, construct: null,
draggable: false, draggable: false,
@ -83,7 +84,7 @@ Ox.List = function(options, self) {
} : sort; } : sort;
}); });
if (Ox.isArray(self.options.items)) { if (Ox.isArray(self.options.items) && !self.options._tree) {
self.options.items = Ox.api(self.options.items, { self.options.items = Ox.api(self.options.items, {
cache: true, cache: true,
sort: self.options.sort, sort: self.options.sort,
@ -121,7 +122,8 @@ Ox.List = function(options, self) {
$items: [], $items: [],
$pages: [], $pages: [],
format: {}, format: {},
isAsync: true, //isAsync: true,
isAsync: !self.options._tree,
itemMargin: self.options.type == 'text' ? 0 : 8, // 2 x 4 px margin ... fixme: the 2x should be computed later itemMargin: self.options.type == 'text' ? 0 : 8, // 2 x 4 px margin ... fixme: the 2x should be computed later
keyboardEvents: { keyboardEvents: {
key_control_c: copyItems, key_control_c: copyItems,
@ -457,7 +459,6 @@ Ox.List = function(options, self) {
var height = getHeight(), var height = getHeight(),
lastItemHeight = height % self.options.itemHeight || self.options.itemHeight, lastItemHeight = height % self.options.itemHeight || self.options.itemHeight,
visibleItems = Math.ceil(height / self.options.itemHeight); visibleItems = Math.ceil(height / self.options.itemHeight);
//Ox.print('FFP!!!', height)
if (self.listLength < visibleItems) { if (self.listLength < visibleItems) {
Ox.range(self.listLength, visibleItems).forEach(function(i) { Ox.range(self.listLength, visibleItems).forEach(function(i) {
var $item = Ox.ListItem({ var $item = Ox.ListItem({
@ -1463,9 +1464,9 @@ Ox.List = function(options, self) {
$item.insertAfter($items[i - 1]); $item.insertAfter($items[i - 1]);
} }
}); });
///////self.options.items.splice.apply(self.options.items, Ox.merge([pos, 0], items)); self.options.items.splice.apply(self.options.items, Ox.merge([pos, 0], items));
self.$items.splice.apply(self.$items, Ox.merge([pos, 0], $items)); self.$items.splice.apply(self.$items, Ox.merge([pos, 0], $items));
///////self.listLength = self.options.items.length; self.listLength = self.options.items.length;
//loadItems(); //loadItems();
updatePositions(); updatePositions();
} }
@ -1569,14 +1570,14 @@ Ox.List = function(options, self) {
self.selected.indexOf(i) > -1 && deselect(i); self.selected.indexOf(i) > -1 && deselect(i);
self.$items[i].remove(); self.$items[i].remove();
}); });
///////self.options.items.splice(pos, length); self.options.items.splice(pos, length);
self.$items.splice(pos, length); self.$items.splice(pos, length);
self.selected.forEach(function(v, i) { self.selected.forEach(function(v, i) {
if (v >= pos + length) { if (v >= pos + length) {
self.selected[i] -= length; self.selected[i] -= length;
} }
}); });
///////self.listLength = self.options.items.length; self.listLength = self.options.items.length;
updatePositions(); updatePositions();
} }
} }

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

@ -604,7 +604,6 @@ Ox.TextList = function(options, self) {
} }
function getCell(id, key) { function getCell(id, key) {
Ox.print('List', 'getCell', id, key)
var $item = getItem(id); var $item = getItem(id);
key = key || ''; // fixme: what is this? key = key || ''; // fixme: what is this?
return $($item.find('.OxCell.OxColumn' + Ox.toTitleCase(key))[0]); return $($item.find('.OxCell.OxColumn' + Ox.toTitleCase(key))[0]);

1
source/Ox.UI/js/List/Ox.TreeList.js
View file

@ -44,6 +44,7 @@ Ox.TreeList = function(options, self) {
} }
that.$element = Ox.List({ that.$element = Ox.List({
_tree: true,
construct: constructItem, construct: constructItem,
itemHeight: 16, itemHeight: 16,
items: parseItems(), items: parseItems(),