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

more fixes (list)

Browse source
This commit is contained in:
Rolux 2010-06-30 00:19:41 +02:00
parent 62285d03af
commit 813dc0a039
1 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
build/js/ox.ui.js
View file

@ -2382,6 +2382,7 @@ requires
type: "text" type: "text"
}) })
.options(options || {}) .options(options || {})
.click(click)
.scroll(scroll); .scroll(scroll);
$.extend(self, { $.extend(self, {
@ -2459,6 +2460,10 @@ requires
} }
} }
function click(e) {
Ox.print("e.target", e.target);
}
function deselect(pos) { function deselect(pos) {
if (isSelected(pos)) { if (isSelected(pos)) {
selected.splice(selected.indexOf(pos), 1); selected.splice(selected.indexOf(pos), 1);
@ -2484,8 +2489,8 @@ requires
function getPage() { function getPage() {
return self.options.orientation == "vertical" return self.options.orientation == "vertical"
? Math.floor(that.scrollTop() / pageHeight) ? Math.floor(that.scrollTop() / self.pageHeight)
: Math.floor(that.scrollLeft() / pageWidth); : Math.floor(that.scrollLeft() / self.pageWidth);
} }
function getPrevious() { function getPrevious() {
@ -2507,7 +2512,7 @@ requires
} }
function loadPage(page, callback) { function loadPage(page, callback) {
Ox.print("loadPage", page, self.pages) Ox.print("loadPage", page)
if (page < 0 || page >= self.pages) { if (page < 0 || page >= self.pages) {
return; return;
} }
@ -2540,6 +2545,7 @@ requires
self.$items[pos].appendTo(self.$pages[page]) self.$items[pos].appendTo(self.$pages[page])
}); });
self.$pages[page].appendTo(that.$content); self.$pages[page].appendTo(that.$content);
Ox.print(page, "self.$pages", self.$pages)
}, },
keys: self.options.keys, keys: self.options.keys,
range: range, range: range,
@ -2645,6 +2651,12 @@ requires
} }
function unloadPage(page) { function unloadPage(page) {
if (page < 0 || page >= self.pages) {
return;
}
Ox.print("unloadPage", page)
Ox.print("self.$pages", self.$pages)
Ox.print(!Ox.isUndefined(self.$pages[page]))
!Ox.isUndefined(self.$pages[page]) && self.$pages[page].remove(); !Ox.isUndefined(self.$pages[page]) && self.$pages[page].remove();
} }
@ -2663,13 +2675,13 @@ requires
Ox.Request.cancel(v); Ox.Request.cancel(v);
}); });
self.requests = []; self.requests = [];
unloadPages(self.page);
$.extend(self, { $.extend(self, {
$items: [], $items: [],
$pages: [], $pages: [],
page: 0, page: 0,
selected: [] selected: []
}); });
unloadPages(self.page);
that.scrollTop(0); that.scrollTop(0);
loadPages(self.page); loadPages(self.page);
} }
@ -2868,7 +2880,7 @@ requires
var $item = $("<div>") var $item = $("<div>")
.addClass("OxItem") .addClass("OxItem")
.css({ .css({
width: Ox.sum(self.columnWidths) + "px" width: Math.max(Ox.sum(self.columnWidths), that.$element.width() - 12) + "px"
}) })
.data("pos", pos); .data("pos", pos);
$.each(self.visibleColumns, function(i, v) { $.each(self.visibleColumns, function(i, v) {
@ -2914,6 +2926,10 @@ requires
} }
function resize() {
}
function resizeColumn(id, width) { function resizeColumn(id, width) {
var i = getColumnIndexById(id), var i = getColumnIndexById(id),
pos = getColumnPositionById(id); pos = getColumnPositionById(id);