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

minor changes

Browse source
This commit is contained in:
rlx 2012-01-17 23:04:33 +05:30
parent f2d7beeb22
commit 3acc606fa2
2 changed files with 23 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
source/Ox.UI/js/Core/Ox.LoadingIcon.js
View file

@ -13,16 +13,16 @@ Ox.LoadingIcon <f:Ox.Element> Loading Icon Element
Ox.LoadingIcon = function(options, self) { Ox.LoadingIcon = function(options, self) {
self = self || {}; self = self || {};
var that = Ox.Element('<img>', self) var that = Ox.Element('<img>', self)
.defaults({ .defaults({
size: 'medium' size: 'medium'
}) })
.options(options || {}) .options(options || {})
.attr({ .attr({
src: Ox.UI.getImageURL('symbolLoading') src: Ox.UI.getImageURL('symbolLoading')
}) })
.addClass( .addClass(
'OxLoadingIcon Ox' + Ox.toTitleCase(self.options.size) 'OxLoadingIcon Ox' + Ox.toTitleCase(self.options.size)
); );
/*@ /*@
start <f> Start loading animation start <f> Start loading animation
() -> <f> Loading Icon Element () -> <f> Loading Icon Element
@ -36,7 +36,6 @@ Ox.LoadingIcon = function(options, self) {
}, 250); }, 250);
return that; return that;
}; };
/*@ /*@
stop <f> Stop loading animation stop <f> Stop loading animation
() -> <f> Loading Icon Element () -> <f> Loading Icon Element
@ -44,9 +43,10 @@ Ox.LoadingIcon = function(options, self) {
that.stop = function() { that.stop = function() {
that.animate({ that.animate({
opacity: 0 opacity: 0
}, 250) }, 250. function() {
.attr({ .attr({
src: Ox.UI.getImageURL('symbolLoading') src: Ox.UI.getImageURL('symbolLoading')
});
}); });
return that; return that;
}; };

18
source/Ox.UI/js/List/Ox.ListItem.js
View file

@ -22,14 +22,14 @@ Ox.ListItem = function(options, self) {
self = self || {}; self = self || {};
var that = Ox.Element({}, self) var that = Ox.Element({}, self)
.defaults({ .defaults({
construct: null, construct: null,
data: {}, data: {},
draggable: false, draggable: false,
position: 0, position: 0,
unique: '' unique: ''
}) })
.options(options || {}); .options(options || {});
constructItem(); constructItem();
@ -42,9 +42,7 @@ Ox.ListItem = function(options, self) {
}); });
if (update) { if (update) {
that.$element.hasClass('OxSelected') && $element.addClass('OxSelected'); that.$element.hasClass('OxSelected') && $element.addClass('OxSelected');
// that.$element.replaceWith($element);
} }
// that.$element = $element;
that.setElement($element); that.setElement($element);
} }