forked from 0x2620/oxjs
merging changes
This commit is contained in:
parent
18f117138d
commit
182225ebc4
66 changed files with 206 additions and 186 deletions
|
|
@ -65,7 +65,12 @@ Ox.List = function(options, self) {
|
|||
.options(options || {})
|
||||
.scroll(scroll);
|
||||
|
||||
that.mousedown(_mousedown);
|
||||
// fixme: in short icon lists, we would want to use that.$element (i.e. that),
|
||||
// to deselect by clicking below the items
|
||||
// but clicking on the scrollbar then causes weird selections
|
||||
// ... we need something analogous to fillFirstPage for icon lists
|
||||
that.$content.mousedown(_mousedown);
|
||||
|
||||
//that.bindEvent('doubleclick', function() {alert('d')})
|
||||
/*
|
||||
that.$content.bindEvent({ // fixme: port to new Ox mouse events
|
||||
|
|
@ -498,9 +503,9 @@ Ox.List = function(options, self) {
|
|||
}
|
||||
|
||||
function getListSize() {
|
||||
return Math.ceil(self.listLength *
|
||||
(self.options[self.options.orientation == 'horizontal' ?
|
||||
'itemWidth' : 'itemHeight'] + self.itemMargin) / self.rowLength);
|
||||
return Math.ceil(self.listLength * (self.options[
|
||||
self.options.orientation == 'horizontal' ? 'itemWidth' : 'itemHeight'
|
||||
] + self.itemMargin) / self.rowLength);
|
||||
}
|
||||
|
||||
function getNext() {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue