From 9dd695b6cace30e431af3574c4fd2f6916272e0d Mon Sep 17 00:00:00 2001 From: rlx <0x0073@0x2620.org> Date: Tue, 23 Aug 2011 23:57:03 +0000 Subject: [PATCH] fixing a regression where icons in a list would not display in their loading state --- source/Ox.UI/js/List/Ox.IconList.js | 22 +++++++++++----------- source/Ox.UI/themes/modern/css/modern.css | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/source/Ox.UI/js/List/Ox.IconList.js b/source/Ox.UI/js/List/Ox.IconList.js index c2393d61..e58c74e4 100644 --- a/source/Ox.UI/js/List/Ox.IconList.js +++ b/source/Ox.UI/js/List/Ox.IconList.js @@ -82,17 +82,17 @@ Ox.IconList = function(options, self) { updateKeys(); function constructItem(data) { - var isEmpty = Ox.isEmpty(data), - data = !isEmpty - ? self.options.item(data, self.options.sort, self.options.size) - : { - width: Math.round(self.options.size * ( - self.options.defaultRatio >= 1 ? 1 : self.options.defaultRatio - )), - height: Math.round(self.options.size / ( - self.options.defaultRatio <= 1 ? 1 : self.options.defaultRatio - )) - }; + var isEmpty = Ox.isEmpty(data); + data = !isEmpty + ? self.options.item(data, self.options.sort, self.options.size) + : { + width: Math.round(self.options.size * ( + self.options.defaultRatio >= 1 ? 1 : self.options.defaultRatio + )), + height: Math.round(self.options.size / ( + self.options.defaultRatio <= 1 ? 1 : self.options.defaultRatio + )) + }; return self.options.itemConstructor(Ox.extend(data, { borderRadius: self.options.borderRadius, iconHeight: self.iconHeight, diff --git a/source/Ox.UI/themes/modern/css/modern.css b/source/Ox.UI/themes/modern/css/modern.css index 1dc5ac08..19861fec 100644 --- a/source/Ox.UI/themes/modern/css/modern.css +++ b/source/Ox.UI/themes/modern/css/modern.css @@ -233,8 +233,8 @@ Lists ================================================================================ */ -.OxThemeModern .OxIconList .OxItem > img.OxLoading, -.OxThemeModern .OxInfoList .OxIcon > img.OxLoading { +.OxThemeModern .OxIconList .OxItem > .OxIcon > img.OxLoading, +.OxThemeModern .OxInfoList .OxItem > .OxIcon > img.OxLoading { border-color: rgb(48, 48, 48); 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));