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

fixing a regression where icons in a list would not display in their loading state

Browse source
This commit is contained in:
rlx 2011-08-23 23:57:03 +00:00
parent cb8685a340
commit 9dd695b6ca
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -82,17 +82,17 @@ Ox.IconList = function(options, self) {
updateKeys(); updateKeys();
function constructItem(data) { function constructItem(data) {
var isEmpty = Ox.isEmpty(data), var isEmpty = Ox.isEmpty(data);
data = !isEmpty data = !isEmpty
? self.options.item(data, self.options.sort, self.options.size) ? self.options.item(data, self.options.sort, self.options.size)
: { : {
width: Math.round(self.options.size * ( width: Math.round(self.options.size * (
self.options.defaultRatio >= 1 ? 1 : self.options.defaultRatio self.options.defaultRatio >= 1 ? 1 : self.options.defaultRatio
)), )),
height: Math.round(self.options.size / ( height: Math.round(self.options.size / (
self.options.defaultRatio <= 1 ? 1 : self.options.defaultRatio self.options.defaultRatio <= 1 ? 1 : self.options.defaultRatio
)) ))
}; };
return self.options.itemConstructor(Ox.extend(data, { return self.options.itemConstructor(Ox.extend(data, {
borderRadius: self.options.borderRadius, borderRadius: self.options.borderRadius,
iconHeight: self.iconHeight, iconHeight: self.iconHeight,

4
source/Ox.UI/themes/modern/css/modern.css
View file

@ -233,8 +233,8 @@ Lists
================================================================================ ================================================================================
*/ */
.OxThemeModern .OxIconList .OxItem > img.OxLoading, .OxThemeModern .OxIconList .OxItem > .OxIcon > img.OxLoading,
.OxThemeModern .OxInfoList .OxIcon > img.OxLoading { .OxThemeModern .OxInfoList .OxItem > .OxIcon > img.OxLoading {
border-color: rgb(48, 48, 48); border-color: rgb(48, 48, 48);
background: -moz-linear-gradient(top, rgb(32, 32, 32), rgb(0, 0, 0)); background: -moz-linear-gradient(top, rgb(32, 32, 32), rgb(0, 0, 0));
background: -webkit-linear-gradient(top, rgb(32, 32, 32), rgb(0, 0, 0)); background: -webkit-linear-gradient(top, rgb(32, 32, 32), rgb(0, 0, 0));