in Ox.Calendar tooltips, only display the text representation of an event's range if it's different from the event's name
This commit is contained in:
parent
7415b72037
commit
b6c872b5a4
3 changed files with 12 additions and 3 deletions
|
@ -801,8 +801,9 @@ Ox.Calendar = function(options, self) {
|
|||
event, title;
|
||||
if ($target.is('.OxLine > .OxEvent')) {
|
||||
event = getEventById($target.data('id'));
|
||||
title = '<span class="OxBright">' + event.name + '</span><br/>' +
|
||||
event.rangeText + '<br>' + event.durationText;
|
||||
title = '<span class="OxBright">' + event.name + '</span><br/>'
|
||||
+ (event.rangeText != event.name ? event.rangeText + '<br>' : '')
|
||||
+ event.durationText;
|
||||
} else {
|
||||
title = Ox.formatDate(getMouseDate(e), '%a, %b %e, %x, %H:%M:%S', true);
|
||||
}
|
||||
|
|
|
@ -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() ???
|
||||
|
||||
/*@
|
||||
|
|
|
@ -427,7 +427,7 @@ Ox.List = function(options, self) {
|
|||
var height = getHeight(),
|
||||
lastItemHeight = height % self.options.itemHeight || 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) {
|
||||
Ox.range(self.listLength, visibleItems).forEach(function(v) {
|
||||
var $item = Ox.ListItem({
|
||||
|
|
Loading…
Reference in a new issue