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

3
source/Ox.UI/js/Bar/Ox.Resizebar.js
View file

@ -65,12 +65,11 @@ Ox.Resizebar = function(options, self) {
function dragstart(event, e) {
if (self.options.resizable && !self.options.collapsed) {
Ox.print('DRAGSTART')
self.drag = {
startPos: e[self.clientXY],
startSize: self.options.size
}
} else { Ox.print('NO DRAGSTART r !c', self.options.resizable, !self.options.collapsed) }
}
}
function drag(event, e) {

2
source/Ox.UI/js/Core/Ox.DocPage.js
View file

@ -40,7 +40,7 @@ Ox.DocPage = function(options, self) {
.html(
'<code><b>' + (name || item.name) + '</b> ' +
'&lt;' + item.types.join('&gt;</code> or <code>&lt;') + '&gt; </code>' +
(item['default'] ? 'default: <code>' + item['default'] + ' </code>' : '') +
(item['default'] ? '(default: <code>' + item['default'] + '</code>) ' : '') +
Ox.parseHTML(item.summary)
)
];

9
source/Ox.UI/js/Core/Ox.DocPanel.js
View file

@ -106,9 +106,9 @@ Ox.DocPanel = function(options, self) {
}
}
(
docItem.section ?
treeItems[moduleIndex].items[sectionIndex] :
treeItems[moduleIndex]
docItem.section
? treeItems[moduleIndex].items[sectionIndex]
: treeItems[moduleIndex]
).items.push({
id: docItem.name,
title: docItem.name
@ -119,7 +119,7 @@ Ox.DocPanel = function(options, self) {
item.items.sort(sortByTitle);
item.items.forEach(function(subitem) {
subitem.items.sort(sortByTitle);
})
});
});
self.$list = Ox.TreeList({
items: treeItems,
@ -154,7 +154,6 @@ Ox.DocPanel = function(options, self) {
var selected;
if (data.ids.length) {
selected = data.ids[0];
Ox.print('selected', data.ids)
if (selected[0] != '_') {
self.$page = Ox.DocPage({
item: getItemByName(selected)

12
source/Ox.UI/js/Core/Ox.Request.js
View file

@ -3,9 +3,9 @@
Ox.Request <o> Basic request handler object
FIXME: options is not a property, just documenting defaults
options <o> Options object
timeout <n|60000> request timeout
type <s|POST> request type, possible values POST, GET, PUT, DELETE
url <s> request url
timeout <n|60000> request timeout
type <s|"POST"> request type, possible values POST, GET, PUT, DELETE
url <s> request url
@*/
Ox.Request = function(options) {
@ -26,8 +26,8 @@ Ox.Request = function(options) {
/*@
cancel <f> cancel pending requests
() -> <u> cancel all requests
(f) -> <u> cancel all requests where function returns true
(n) -> <u> cancel request by id
(fn) -> <u> cancel all requests where function returns true
(id) -> <u> cancel request by id
@*/
cancel: function() {
if (arguments.length == 0) {
@ -47,7 +47,7 @@ Ox.Request = function(options) {
},
/*@
clearCache <f> clear cached results
() -> <u>
() -> <u> ...
@*/
clearCache: function() {
cache = {};

2
source/Ox.UI/js/Form/Ox.Range.js
View file

@ -16,7 +16,7 @@ Ox.Range <f:Ox.Element> Range Object
thumbSize <n> minimum width or height of thumb, in px
thumbValue <b> if true, display value on thumb
trackGradient <a> colors
trackImages <s> or <a> one or multiple track background image URLs
trackImages <s|[s]> one or multiple track background image URLs
trackStep <n> 0 (scroll here) or step when clicking track
value <n> initial value
valueNames <a> value names to display on thumb

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;
}

10
source/Ox.UI/js/Map/Ox.ListMap.js
View file

@ -6,11 +6,11 @@ Ox.ListMap <f:Ox.Element> ListMap Object
(options) -> <f> ListMap Object
(options, self) -> <f> ListMap Object
options <o> Options object
height <n|256>
labels <b|false>
places <f|null>
selected <a|[]>
width <n|256>
height <n|256> height
labels <b|false> labels
places <f|null> places
selected <a|[]> selected
width <n|256> width
self <o> shared private variable
@*/

4
source/Ox.UI/js/Map/Ox.Map.js
View file

@ -560,9 +560,9 @@ Ox.Map = function(options, self) {
callback = point;
point = self.map.getCenter();
}
Ox.print('CALLING ZOOM SERVICE', point.lat(), point.lng())
//Ox.print('CALLING ZOOM SERVICE', point.lat(), point.lng())
self.maxZoomService.getMaxZoomAtLatLng(point, function(data) {
Ox.print('ZOOM SERVICE', data.status, data.zoom)
//Ox.print('ZOOM SERVICE', data.status, data.zoom)
callback(data.status == 'OK' ? data.zoom : null);
});
}