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

Only return Ox.Element if exactly one jquery element is return.

Browse source 
Fixes use of find, children
This commit is contained in:
j 2011-12-29 15:40:08 +05:30
parent 771d2be37b
commit ac4dd51ed7
6 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/Ox.UI/js/Calendar/Ox.Calendar.js
View file

@ -1124,7 +1124,7 @@ Ox.Calendar = function(options, self) {
} }
function setEventControls(event) { function setEventControls(event) {
var $eventControls = that.$element.find('.OxEventControl'), var $eventControls = that.find('.OxEventControl'),
isVisible = self.$eventControls.name.is(':visible'); isVisible = self.$eventControls.name.is(':visible');
if (event) { if (event) {
self.$eventControls.name.options({title: event.name}); self.$eventControls.name.options({title: event.name});

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

@ -10,8 +10,7 @@ Ox.JQueryElement <function> Wrapper for jQuery
$element <object> jQuery DOM Element $element <object> jQuery DOM Element
@*/ @*/
// fixme: it seems that children(), find() etc. don't work directly, // fixme: now that children(), find() work, change code to call find directly.
// and still have to be called on the $element
Ox.JQueryElement = function($element) { Ox.JQueryElement = function($element) {
var that = this; var that = this;
@ -48,10 +47,12 @@ Ox.forEach($('<div>'), function(val, key) {
} }
}); });
ret = that.$element[key].apply(that.$element, args); ret = that.$element[key].apply(that.$element, args);
// if the $element of an ox object was returned // if exactly one $element of an ox object was returned
// then return the ox object instead // then return the ox object instead
// so that we can do oxObj.jqFn().oxFn() // so that we can do oxObj.jqFn().oxFn()
return ret && ret.jquery && Ox.UI.elements[id = ret.data('oxid')] return ret && ret.jquery
&& ret.length == 1
&& Ox.UI.elements[id = ret.data('oxid')]
? Ox.UI.elements[id] : ret; ? Ox.UI.elements[id] : ret;
}; };
} }

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

@ -426,7 +426,7 @@ Ox.List = function(options, self) {
function emptyFirstPage() { function emptyFirstPage() {
if (self.$pages[0]) { if (self.$pages[0]) {
if (self.options.type == 'text') { if (self.options.type == 'text') {
self.$pages[0].$element.find('.OxEmpty').remove(); self.$pages[0].find('.OxEmpty').remove();
} else if (self.options.orientation == 'both') { } else if (self.options.orientation == 'both') {
that.$content.css({height: getListSize() + 'px'}); that.$content.css({height: getListSize() + 'px'});
} }

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

@ -615,7 +615,7 @@ Ox.TextList = function(options, self) {
function getItem(id) { function getItem(id) {
//Ox.Log('List', 'getItem', id) //Ox.Log('List', 'getItem', id)
var $item = null; var $item = null;
that.$element.find('.OxItem').each(function() { that.find('.OxItem').each(function() {
var $this = $(this); var $this = $(this);
if ($this.data('id') == id) { if ($this.data('id') == id) {
$item = $this; $item = $this;
@ -658,7 +658,7 @@ Ox.TextList = function(options, self) {
? $('.OxHeadCell' + stopSelector).next() ? $('.OxHeadCell' + stopSelector).next()
: $('.OxHeadCell' + stopSelector)); : $('.OxHeadCell' + stopSelector));
$resize.detach().insertAfter($column); $resize.detach().insertAfter($column);
that.$body.$element.find('.OxItem').each(function() { that.$body.find('.OxItem').each(function() {
var $this = $(this); var $this = $(this);
$this.children(startSelector).detach()[insert]( $this.children(startSelector).detach()[insert](
$this.children(stopSelector) $this.children(stopSelector)
@ -672,7 +672,7 @@ Ox.TextList = function(options, self) {
self.visibleColumns.splice(stopPos, 0, visibleColumn); self.visibleColumns.splice(stopPos, 0, visibleColumn);
var pos = getColumnPositionById(self.options.columns[self.selectedColumn].id); var pos = getColumnPositionById(self.options.columns[self.selectedColumn].id);
if (pos > -1) { if (pos > -1) {
that.$element.find('.OxResize .OxSelected').removeClass('OxSelected'); that.find('.OxResize .OxSelected').removeClass('OxSelected');
pos > 0 && self.$heads[pos].prev().children().eq(2).addClass('OxSelected'); pos > 0 && self.$heads[pos].prev().children().eq(2).addClass('OxSelected');
self.$heads[pos].next().children().eq(0).addClass('OxSelected'); self.$heads[pos].next().children().eq(0).addClass('OxSelected');
if (pos == stopPos) { if (pos == stopPos) {
@ -697,7 +697,7 @@ Ox.TextList = function(options, self) {
that.$head.$content.empty(); that.$head.$content.empty();
constructHead(); constructHead();
itemWidth = getItemWidth(); itemWidth = getItemWidth();
that.$body.$element.find('.OxItem').each(function() { that.$body.find('.OxItem').each(function() {
var $this = $(this); var $this = $(this);
$this.children(selector).remove(); $this.children(selector).remove();
$this.css({width: itemWidth + 'px'}); $this.css({width: itemWidth + 'px'});
@ -738,7 +738,7 @@ Ox.TextList = function(options, self) {
width: width - 9 - (i == self.selectedColumn ? 16 : 0) + 'px' width: width - 9 - (i == self.selectedColumn ? 16 : 0) + 'px'
}); });
} }
that.$element.find('.OxCell.OxColumn' + Ox.toTitleCase(self.options.columns[i].id)).css({ that.find('.OxCell.OxColumn' + Ox.toTitleCase(self.options.columns[i].id)).css({
width: width - (self.options.columnsVisible ? 9 : 8) + 'px' width: width - (self.options.columnsVisible ? 9 : 8) + 'px'
}); });
setWidth(); setWidth();

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

@ -181,10 +181,7 @@ Ox.TreeList = function(options, self) {
function toggleItem(item, expanded) { function toggleItem(item, expanded) {
var $img, pos; var $img, pos;
item.expanded = expanded; item.expanded = expanded;
//fixme why does that.find('.OxItem').each(function() {
//that.$element.find('.OxItem').each(function() {
//only return one element?
$(that.$element).find('.OxItem').each(function() {
var $item = $(this); var $item = $(this);
if ($item.data('id') == item.id) { if ($item.data('id') == item.id) {
$img = $item.find('.OxToggle'); $img = $item.find('.OxToggle');

2
source/Ox.UI/js/Video/Ox.VideoPlayer.js
View file

@ -1131,7 +1131,7 @@ Ox.VideoPlayer = function(options, self) {
}); });
showControls(); showControls();
hideControls(); hideControls();
that.$element.find('.OxControls').bind({ that.find('.OxControls').bind({
mouseenter: function() { mouseenter: function() {
self.mouseIsInControls = true; self.mouseIsInControls = true;
}, },