Merge branch 'master' into calendar_import

This commit is contained in:
Georg Ehrke 2012-07-03 16:39:09 +02:00
commit 0b3ed2b048
1 changed files with 1 additions and 1 deletions

View File

@ -867,7 +867,7 @@ $(document).ready(function(){
eventDrop: Calendar.UI.moveEvent, eventDrop: Calendar.UI.moveEvent,
eventResize: Calendar.UI.resizeEvent, eventResize: Calendar.UI.resizeEvent,
eventRender: function(event, element) { eventRender: function(event, element) {
element.find('.fc-event-title').html(element.find('.fc-event-title').html()); element.find('.fc-event-title').html(element.find('.fc-event-title').text());
element.tipsy({ element.tipsy({
className: 'tipsy-event', className: 'tipsy-event',
opacity: 0.9, opacity: 0.9,