sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests Activity

fixing a bug where in a list, the click target loop would not exit when items are added or removed on click

Browse source
This commit is contained in:
rlx 2011-09-05 05:40:44 +00:00
commit c3b59a62fe
8 changed files with 71 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -72,8 +72,6 @@ Ox.List = function(options, self) {
.options(options || {})
.scroll(scroll);
//that.$content.mousedown(_mousedown);
that.$content.bindEvent({
mousedown: mousedown,
singleclick: singleclick,
@ -94,7 +92,6 @@ Ox.List = function(options, self) {
drag: move,
dragend: moveend
});
}
// fixme: without this, horizontal lists don't get their full width
@ -169,7 +166,7 @@ Ox.List = function(options, self) {
] = addNextToSelection;
}
if (self.options.orientation == 'vertical') {
$.extend(self.keyboardEvents, {
Ox.extend(self.keyboardEvents, {
key_left: function() {
triggerToggleEvent(false);
},
@ -178,7 +175,7 @@ Ox.List = function(options, self) {
}
});
} else if (self.options.orientation == 'both') {
$.extend(self.keyboardEvents, {
Ox.extend(self.keyboardEvents, {
key_down: selectBelow,
key_up: selectAbove
});
@ -458,13 +455,20 @@ Ox.List = function(options, self) {
function findItemPosition(e) {
var $element = $(e.target),
$parent,
position = -1;
while (!$element.hasClass('OxTarget') && !$element.hasClass('OxPage') && !$element.is('body')) {
$element = $element.parent();
while (
!$element.hasClass('OxTarget') && !$element.hasClass('OxPage')
&& ($parent = $element.parent()).length
) {
$element = $parent;
}
if ($element.hasClass('OxTarget')) {
while (!$element.hasClass('OxItem') && !$element.hasClass('OxPage') && !$element.is('body')) {
$element = $element.parent();
while (
!$element.hasClass('OxItem') && !$element.hasClass('OxPage')
&& ($parent = $element.parent()).length
) {
$element = $parent;
}
if ($element.hasClass('OxItem')) {
position = $element.data('position');

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

@ -53,8 +53,8 @@ Ox.TreeList = function(options, self) {
.css({
width: self.options.width + 'px'
})
.click(clickItem)
.bindEvent({
anyclick: clickItem,
toggle: toggleItems
});
@ -142,7 +142,7 @@ Ox.TreeList = function(options, self) {
},
type = Ox.typeOf(value);
if (type == 'array' || type == 'object') {
ret.title += Ox.toTitleCase(type);
ret.title += Ox.toTitleCase(type) + ' [' + Ox.len(value) + ']';
ret.items = Ox.map(Ox.sort(Ox.keys(value)), function(k) {
return parseData(k, value[k]);
});
@ -177,8 +177,8 @@ Ox.TreeList = function(options, self) {
var $img, pos;
item.expanded = expanded;
//getItemById(item.id).expanded = expanded;
$.each(that.$element.find('.OxItem'), function(i, v) {
var $item = $(v);
$.each(that.$element.find('.OxItem'), function() {
var $item = $(this);
if ($item.data('id') == item.id) {
$img = $item.find('.OxToggle');
pos = $item.data('position');