diff --git a/src/agenda/AgendaEventRenderer.js b/src/agenda/AgendaEventRenderer.js index 423d14c..fe67808 100644 --- a/src/agenda/AgendaEventRenderer.js +++ b/src/agenda/AgendaEventRenderer.js @@ -420,9 +420,7 @@ function AgendaEventRenderer() { if (revert) { // hasn't moved or is out of bounds (draggable has already reverted) resetElement(); - if ($.browser.msie) { - eventElement.css('filter', ''); // clear IE opacity side-effects - } + eventElement.css('filter', ''); // clear IE opacity side-effects showEvents(event, eventElement); }else{ // changed! @@ -473,9 +471,6 @@ function AgendaEventRenderer() { start: function(ev, ui) { trigger('eventDragStart', eventElement, event, ev, ui); hideEvents(event, eventElement); - if ($.browser.msie) { - eventElement.find('div.fc-event-bg').hide(); // nested opacities mess up in IE, just hide - } origPosition = eventElement.position(); minuteDelta = prevMinuteDelta = 0; hoverListener.start(function(cell, origCell, rowDelta, colDelta) { @@ -523,12 +518,6 @@ function AgendaEventRenderer() { resetElement(); eventElement.css(origPosition); // sometimes fast drags make event revert to wrong position updateTimeText(0); - if ($.browser.msie) { // TODO: dont use browser detection. base off of the presence of filter - eventElement - .css('filter', '') // clear IE opacity side-effects - .find('div.fc-event-bg') - .show(); - } showEvents(event, eventElement); } } @@ -568,9 +557,6 @@ function AgendaEventRenderer() { start: function(ev, ui) { slotDelta = prevSlotDelta = 0; hideEvents(event, eventElement); - if ($.browser.msie && $.browser.version == '6.0') { - eventElement.css('overflow', 'hidden'); - } eventElement.css('z-index', 9); trigger('eventResizeStart', this, event, ev, ui); }, diff --git a/src/agenda/AgendaView.js b/src/agenda/AgendaView.js index 67b2201..b38f8e4 100644 --- a/src/agenda/AgendaView.js +++ b/src/agenda/AgendaView.js @@ -708,9 +708,6 @@ function AgendaView(element, calendar, viewName) { }, rect )); - if ($.browser.msie) { - selectionHelper.find('div.fc-event-bg').hide(); // nested opacities mess up in IE, just hide - } selectionHelper.css('opacity', opt('dragOpacity')); } if (selectionHelper) { diff --git a/src/agenda/agenda.css b/src/agenda/agenda.css index 4c2ab59..0685fd3 100644 --- a/src/agenda/agenda.css +++ b/src/agenda/agenda.css @@ -118,6 +118,10 @@ filter: alpha(opacity=30); } +.fc .ui-draggable-dragging .fc-event-bg { + display: none\9; /* for IE6/7/8. nested opacity filters while dragging don't work */ + } + /* resizable */ .fc-event-vert .ui-resizable-s { @@ -132,4 +136,8 @@ cursor: s-resize; } +.fc-agenda .ui-resizable-resizing { /* TODO: better selector */ + _overflow: hidden; + } + diff --git a/src/basic/BasicEventRenderer.js b/src/basic/BasicEventRenderer.js index e7a211b..3c1acc6 100644 --- a/src/basic/BasicEventRenderer.js +++ b/src/basic/BasicEventRenderer.js @@ -129,9 +129,7 @@ function BasicEventRenderer() { if (dayDelta) { eventDrop(this, event, dayDelta, 0, event.allDay, ev, ui); }else{ - if ($.browser.msie) { - eventElement.css('filter', ''); // clear IE opacity side-effects - } + eventElement.css('filter', ''); // clear IE opacity side-effects showEvents(event, eventElement); } //setOverflowHidden(false); diff --git a/src/common/DayEventRenderer.js b/src/common/DayEventRenderer.js index 15a9ce6..190d628 100644 --- a/src/common/DayEventRenderer.js +++ b/src/common/DayEventRenderer.js @@ -189,7 +189,9 @@ function DayEventRenderer() { ""; if (seg.isEnd && isEventResizable(event)) { html += - "
"; + "
" + + "   " + // makes hit area a lot better for IE6/7 + "
"; } html += ""; diff --git a/src/common/common.css b/src/common/common.css index 4ee1b54..2f2eb8c 100644 --- a/src/common/common.css +++ b/src/common/common.css @@ -177,8 +177,9 @@ a.fc-event { display: block; position: absolute; z-index: 99999; - border: 0 !important; /* important overrides pre jquery ui 1.7 styles */ - background: url(data:image/gif;base64,AAAA) !important; /* hover fix for IE */ + overflow: hidden; /* hacky spaces (IE6/7) */ + font-size: 300%; /* */ + line-height: 50%; /* */ }