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

Lists: make most recently selected item selected[0]; add selectSelected method to change this item from outside

Browse source
This commit is contained in:
rolux 2014-02-02 12:34:12 +00:00
parent 120a9eda41
commit e069f11c9a
5 changed files with 66 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/Ox.UI/js/List/CustomList.js
View file

@ -134,6 +134,11 @@ Ox.CustomList = function(options, self) {
return that;
};
that.selectSelected = function(offset) {
that.$list.selectSelected(offset);
return that;
};
/*@
size <f> size
@*/

10
source/Ox.UI/js/List/IconList.js
View file

@ -220,6 +220,16 @@ Ox.IconList = function(options, self) {
return that;
};
that.selectPosition = function(pos) {
that.$element.selectPosition(pos);
return that;
};
that.selectSelected = function(offset) {
that.$element.selectSelected(offset);
return that;
};
/*@
size <f> get size of list
() -> <n> size

10
source/Ox.UI/js/List/InfoList.js
View file

@ -239,6 +239,16 @@ Ox.InfoList = function(options, self) {
return that;
};
that.selectPosition = function(pos) {
that.$element.selectPosition(pos);
return that;
};
that.selectSelected = function(offset) {
that.$element.selectSelected(offset);
return that;
};
/*@
size <f> size
@*/

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

@ -355,21 +355,19 @@ Ox.List = function(options, self) {
}
function addToSelection(pos) {
var triggerEvent = false;
Ox.makeArray(pos).forEach(function(pos) {
Ox.makeArray(pos).reverse().forEach(function(pos) {
if (!isSelected(pos)) {
self.selected.push(pos);
self.selected.unshift(pos);
if (!Ox.isUndefined(self.$items[pos])) {
self.$items[pos].addClass('OxSelected');
}
triggerEvent = true;
} else {
// allow for 'cursor navigation' if orientation == 'both'
// allow for 'cursor navigation' if orientation is 'both'
self.selected.splice(self.selected.indexOf(pos), 1);
self.selected.push(pos);
self.selected.unshift(pos);
}
});
triggerEvent && triggerSelectEvent();
triggerSelectEvent();
}
function clear() {
@ -573,7 +571,7 @@ Ox.List = function(options, self) {
function getAbove() {
var pos = -1;
if (self.selected.length) {
pos = self.selected[self.selected.length - 1] - self.rowLength;
pos = self.selected[0] - self.rowLength;
if (pos < 0) {
pos = -1;
}
@ -584,7 +582,7 @@ Ox.List = function(options, self) {
function getBelow() {
var pos = -1;
if (self.selected.length) {
pos = self.selected[self.selected.length - 1] + self.rowLength;
pos = self.selected[0] + self.rowLength;
if (pos >= self.$items.length) {
pos = -1;
}
@ -609,9 +607,11 @@ Ox.List = function(options, self) {
function getNext() {
var pos = -1;
if (self.selected.length) {
pos = (self.options.orientation == 'both'
? self.selected[self.selected.length - 1]
: Ox.max(self.selected)) + 1;
pos = (
self.options.orientation == 'both'
? self.selected[0]
: Ox.max(self.selected)
) + 1;
if (pos == self.$items.length) {
pos = -1;
}
@ -721,9 +721,11 @@ Ox.List = function(options, self) {
function getPrevious() {
var pos = -1;
if (self.selected.length) {
pos = (self.options.orientation == 'both'
? self.selected[self.selected.length - 1]
: Ox.min(self.selected)) - 1;
pos = (
self.options.orientation == 'both'
? self.selected[0]
: Ox.min(self.selected)
) - 1;
}
return pos;
}
@ -1316,7 +1318,7 @@ Ox.List = function(options, self) {
}
var triggerSelectEvent = Ox.debounce(function() {
// throttle in case shift+cursor is pressed
// throttle in case shift+arrow is pressed
getSelectedIds(function(ids, rest) {
self.options.selected = ids;
that.triggerEvent('select', Ox.extend({
@ -1721,6 +1723,24 @@ Ox.List = function(options, self) {
return that;
};
/*@
selectSelected <f> Change the first selected item within the selection
(offset) -> <o> List Object
offset <n> Offset (`-1` for previous, `1` for next)
@*/
that.selectSelected = function(offset) {
var pos, positions;
if (self.selected.length > 1) {
positions = Ox.sort(Ox.clone(self.selected));
pos = positions[
Ox.mod(positions.indexOf(self.selected[0]) + offset, positions.length)
];
addToSelection(pos);
scrollToPosition(pos);
}
return that;
};
/*@
size <f> fixme: not a good function name
() -> <o> List Object

5
source/Ox.UI/js/List/TableList.js
View file

@ -1133,6 +1133,11 @@ Ox.TableList = function(options, self) {
return that;
};
that.selectSelected = function(offset) {
that.$body.selectSelected(offset);
return that;
};
that.setColumnTitle = function(id, title) {
var index = getColumnIndexById(id);
self.options.columns[index].title = title;