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

in Ox.Calendar tooltips, only display the text representation of an event's range if it's different from the event's name

Browse source
This commit is contained in:
rlx 2011-10-29 17:05:44 +00:00
parent 7415b72037
commit b6c872b5a4
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -801,8 +801,9 @@ Ox.Calendar = function(options, self) {
event, title; event, title;
if ($target.is('.OxLine > .OxEvent')) { if ($target.is('.OxLine > .OxEvent')) {
event = getEventById($target.data('id')); event = getEventById($target.data('id'));
title = '<span class="OxBright">' + event.name + '</span><br/>' + title = '<span class="OxBright">' + event.name + '</span><br/>'
event.rangeText + '<br>' + event.durationText; + (event.rangeText != event.name ? event.rangeText + '<br>' : '')
+ event.durationText;
} else { } else {
title = Ox.formatDate(getMouseDate(e), '%a, %b %e, %x, %H:%M:%S', true); title = Ox.formatDate(getMouseDate(e), '%a, %b %e, %x, %H:%M:%S', true);
} }

8
source/Ox.UI/js/Form/Ox.Select.js
View file

@ -184,6 +184,14 @@ Ox.Select = function(options, self) {
} }
}; };
that.disableItem = function(id) {
self.$menu.getItem(id).options({disabled: true});
};
that.enableItem = function(id) {
self.$menu.getItem(id).options({disabled: false});
};
// FIXME: selected() _and_ selectItem() _and_ value() ??? // FIXME: selected() _and_ selectItem() _and_ value() ???
/*@ /*@

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

@ -427,7 +427,7 @@ Ox.List = function(options, self) {
var height = getHeight(), var height = getHeight(),
lastItemHeight = height % self.options.itemHeight || self.options.itemHeight, lastItemHeight = height % self.options.itemHeight || self.options.itemHeight,
visibleItems = Math.ceil(height / self.options.itemHeight); visibleItems = Math.ceil(height / self.options.itemHeight);
Ox.print('FILL', self.listLength, visibleItems); //Ox.print('FILL', self.listLength, visibleItems);
if (self.listLength < visibleItems) { if (self.listLength < visibleItems) {
Ox.range(self.listLength, visibleItems).forEach(function(v) { Ox.range(self.listLength, visibleItems).forEach(function(v) {
var $item = Ox.ListItem({ var $item = Ox.ListItem({