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

fixing encoding functions (deflate, png)

Browse source
This commit is contained in:
rlx 2011-09-05 23:34:29 +00:00
commit 816993e1b9
10 changed files with 235 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -447,10 +447,10 @@ Ox.List = function(options, self) {
function findCell(e) {
var $element = $(e.target);
while (!$element.hasClass('OxCell') && !$element.hasClass('OxPage') && !$element.is('body')) {
while (!$element.is('.OxCell') && !$element.is('.OxPage') && !$element.is('body')) {
$element = $element.parent();
}
return $element.hasClass('OxCell') ? $element : null;
return $element.is('.OxCell') ? $element : null;
}
function findItemPosition(e) {
@ -458,19 +458,19 @@ Ox.List = function(options, self) {
$parent,
position = -1;
while (
!$element.hasClass('OxTarget') && !$element.hasClass('OxPage')
!$element.is('.OxTarget') && !$element.is('.OxPage')
&& ($parent = $element.parent()).length
) {
$element = $parent;
}
if ($element.hasClass('OxTarget')) {
if ($element.is('.OxTarget')) {
while (
!$element.hasClass('OxItem') && !$element.hasClass('OxPage')
!$element.is('.OxItem') && !$element.is('.OxPage')
&& ($parent = $element.parent()).length
) {
$element = $parent;
}
if ($element.hasClass('OxItem')) {
if ($element.is('.OxItem')) {
position = $element.data('position');
}
}
@ -780,7 +780,7 @@ Ox.List = function(options, self) {
// click on unselected item
select(pos);
}
} else if (self.options.min == 0) {
} else if (!$(e.target).is('.OxToggle') && self.options.min == 0) {
// click on empty area
selectNone();
}
@ -850,8 +850,8 @@ Ox.List = function(options, self) {
} else if (self.options.type == 'text' && self.hadFocus) {
$cell = findCell(e);
if ($cell) {
clickable = $cell.hasClass('OxClickable');
editable = $cell.hasClass('OxEditable') && !$cell.hasClass('OxEdit');
clickable = $cell.is('.OxClickable');
editable = $cell.is('.OxEditable') && !$cell.is('.OxEdit');
if (clickable || editable) {
// click on a clickable or editable cell
triggerClickEvent(clickable ? 'click' : 'edit', self.$items[pos], $cell);
@ -904,8 +904,8 @@ Ox.List = function(options, self) {
} else if (self.options.type == 'text' && hadFocus) {
var $cell = findCell(e),
$element = $cell || self.$items[pos];
clickable = $element.hasClass('OxClickable');
editable = $element.hasClass('OxEditable') && !$element.hasClass('OxEdit');
clickable = $element.is('.OxClickable');
editable = $element.is('.OxEditable') && !$element.is('.OxEdit');
if (clickable || editable) {
if (self.options.sortable && self.listLength > 1) {
clickTimeout = true;
@ -944,7 +944,7 @@ Ox.List = function(options, self) {
self.clickTimeout = 0;
open();
}
} else if (!$(e.target).hasClass('OxToggle') && self.options.min == 0) {
} else if (!$(e.target).is('.OxToggle') && self.options.min == 0) {
selectNone();
}
}

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

@ -70,7 +70,7 @@ Ox.TreeList = function(options, self) {
}
function constructItem(data) {
var $item = $('<div>'),
var $item = $('<div>'), //.css({width: self.options.width + 'px'}),
padding = (data.level + !data.items) * 16 - 8;
if (data.level || !data.items) {
$('<div>')
@ -161,14 +161,14 @@ Ox.TreeList = function(options, self) {
items = items || self.options.items;
level = level || 0;
items.forEach(function(item, i) {
var item_ = $.extend({
var item_ = Ox.extend({
level: level
}, item, item.items ? {
items: !!item.expanded ?
parseItems(item.items, level + 1) : []
} : {});
ret.push(item_);
item.items && $.merge(ret, item_.items);
item.items && Ox.merge(ret, item_.items);
});
return ret;
}