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

minor fixes (list)

Browse source
This commit is contained in:
Rolux 2010-06-29 19:39:21 +02:00
parent 24f84e6ee9
commit 782b795a36
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2803,7 +2803,7 @@ requires
$right = $("<div>").addClass("OxRight").appendTo($resize); $right = $("<div>").addClass("OxRight").appendTo($resize);
}); });
that.$head.$content.css({ that.$head.$content.css({
width: Ox.sum(self.columnWidths) + "px" width: (Ox.sum(self.columnWidths) + 2) + "px"
}); });
toggleSelected(self.selectedColumn); toggleSelected(self.selectedColumn);
that.$titles[self.selectedColumn].css({ that.$titles[self.selectedColumn].css({
@ -2916,18 +2916,9 @@ requires
that.sort(args.columns[pos].id, args.columns[pos].operator); that.sort(args.columns[pos].id, args.columns[pos].operator);
} }
function toggleOrder(pos) {
Ox.print("toggleOrder", pos, self.options.sort[0].operator)
that.$titles[pos].next().html(oxui.symbols[
"triangle_" + (self.options.sort[0].operator == "+" ? "up" : "down")
]);
}
function toggleSelected(pos) { function toggleSelected(pos) {
Ox.print("toggleSelected", pos) updateOrder(pos);
if (pos > 0) { pos > 0 && that.$titles[pos].prev().children().eq(2).toggleClass("OxSelected");
that.$titles[pos].prev().children().eq(2).toggleClass("OxSelected");
}
that.$titles[pos].toggleClass("OxSelected"); that.$titles[pos].toggleClass("OxSelected");
that.$titles[pos].next().toggleClass("OxSelected"); that.$titles[pos].next().toggleClass("OxSelected");
that.$titles[pos].next().next().children().eq(0).toggleClass("OxSelected"); that.$titles[pos].next().next().children().eq(0).toggleClass("OxSelected");
@ -2938,6 +2929,12 @@ requires
}); });
} }
function updateOrder(pos) {
that.$titles[pos].next().html(oxui.symbols[
"triangle_" + (self.options.sort[0].operator == "+" ? "up" : "down")
]);
}
that.sort = function(key, operator) { that.sort = function(key, operator) {
var isSelected = key == self.options.sort[0].key; var isSelected = key == self.options.sort[0].key;
self.options.sort = [ self.options.sort = [
@ -2947,7 +2944,7 @@ requires
} }
]; ];
if (isSelected) { if (isSelected) {
toggleOrder(self.selectedColumn); updateOrder(self.selectedColumn);
} else { } else {
toggleSelected(self.selectedColumn); toggleSelected(self.selectedColumn);
self.selectedColumn = getColumnById(key); self.selectedColumn = getColumnById(key);