holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use background color if border color is white

Browse Source
This commit is contained in:
Nathan Gray 2015-12-15 17:07:19 +00:00
parent c5eac7749c
commit 4d5f8da0c9
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
calendar/js/et2_widget_daycol.js
View File

@ -558,13 +558,15 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM],
indicator.css('top',timegrid.scrolling.height() + timegrid.scrolling.scrollTop()-indicator.height());
}
// Match color to the event
if(indicator !== '' &&
// Avoid white, which is hard to see
jQuery.Color(event.div.css('border-top-color')).toString() !== jQuery.Color('white').toString()
)
if(indicator !== '')
{
// Avoid white, which is hard to see
var color = jQuery.Color(event.div.css('border-top-color')).toString() !== jQuery.Color('white').toString() ?
event.div.css('border-top-color') : event.div.css('background-color');
// Use border-top-color, Firefox doesn't give a value with border-color
indicator.css('border-color', event.div.css('border-top-color'));
indicator.css('border-color', color);
}
}
}, this, et2_calendar_event);