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

don't display a blank line if an item doesn't have a title

Browse source
This commit is contained in:
rlx 2011-10-17 15:13:12 +00:00
parent 83fbe6d366
commit 9ac49b6fcf
3 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -109,7 +109,10 @@ Ox.IconItem = function(options, self) {
.mouseenter(mouseenter) .mouseenter(mouseenter)
.mouseleave(mouseleave); .mouseleave(mouseleave);
if (!self.infoIsObject) { if (!self.infoIsObject) {
that.$text.html(self.title + '<br/><span class="OxInfo">' + self.info + '</span>') that.$text.html(
(self.title ? self.title + '<br/>' : '')
+ '<span class="OxInfo">' + self.info + '</span>'
);
} else { } else {
that.$text.append(self.title).append(self.info); that.$text.append(self.title).append(self.info);
} }

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

@ -101,6 +101,7 @@ Ox.InfoList = function(options, self) {
position: 'absolute', position: 'absolute',
width: getItemWidth() - 144 + 'px', width: getItemWidth() - 144 + 'px',
height: 196 + 'px', height: 196 + 'px',
marginTop: '-2px',
overflow: 'hidden' overflow: 'hidden'
}) })
.appendTo($info); .appendTo($info);
@ -200,6 +201,10 @@ Ox.InfoList = function(options, self) {
return that; return that;
}; };
that.updateInfo = function(id, options) {
// ...
}
that.value = function(id, key, value) { that.value = function(id, key, value) {
// fixme: make this accept id, {k: v, ...} // fixme: make this accept id, {k: v, ...}
if (arguments.length == 1) { if (arguments.length == 1) {

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

@ -352,6 +352,13 @@ Lists
-o-box-shadow: 0 0 4px rgba(128, 128, 128, 1); -o-box-shadow: 0 0 4px rgba(128, 128, 128, 1);
-webkit-box-shadow: 0 0 4px rgba(128, 128, 128, 1); -webkit-box-shadow: 0 0 4px rgba(128, 128, 128, 1);
} }
.OxThemeModern .OxInfoList .OxItem.OxSelected .OxIconList .OxIcon > img,
.OxThemeModern .OxInfoList .OxItem.OxSelected .OxIconList .OxIcon .OxVideoPlayer {
border-color: rgba(0, 0, 0, 0);
-moz-box-shadow: 0 0 0 rgba(0, 0, 0, 0);
-o-box-shadow: 0 0 0 rgba(0, 0, 0, 0);
-webkit-box-shadow: 0 0 0 rgba(0, 0, 0, 0);
}
.OxThemeModern .OxIconList .OxItem > .OxText > div, .OxThemeModern .OxIconList .OxItem > .OxText > div,
.OxThemeModern .OxInfoList .OxItem .OxText > div { .OxThemeModern .OxInfoList .OxItem .OxText > div {
text-shadow: rgb(0, 0, 0) -1px -1px 0, text-shadow: rgb(0, 0, 0) -1px -1px 0,
@ -379,6 +386,15 @@ Lists
.OxThemeModern .OxInfoList .OxItem .OxText > div > .OxInfo { .OxThemeModern .OxInfoList .OxItem .OxText > div > .OxInfo {
color: rgb(128, 128, 128); color: rgb(128, 128, 128);
} }
.OxThemeModern .OxInfoList .OxItem.OxSelected .OxIconList .OxIcon > img,
.OxThemeModern .OxInfoList .OxItem.OxSelected .OxIconList .OxIcon .OxVideoPlayer,
.OxThemeModern .OxInfoList .OxItem.OxSelected .OxIconList .OxText > div {
border-color: rgba(0, 0, 0, 0);
background: rgba(0, 0, 0, 0);
-moz-box-shadow: 0 0 0 rgba(0, 0, 0, 0);
-o-box-shadow: 0 0 0 rgba(0, 0, 0, 0);
-webkit-box-shadow: 0 0 0 rgba(0, 0, 0, 0);
}
.OxThemeModern .OxTextList .OxContent { .OxThemeModern .OxTextList .OxContent {