From: <de...@de...> - 2008-09-10 14:55:36
|
Author: ArthurClemens Date: 2008-09-10 09:55:27 -0500 (Wed, 10 Sep 2008) New Revision: 17490 Trac url: http://develop.twiki.org/trac/changeset/17490 Modified: twiki/branches/TWikiRelease04x02/twikiplugins/JSCalendarContrib/pub/TWiki/JSCalendarContrib/calendar.js Log: Item5991: apply patch to fix rendering on IE7 Modified: twiki/branches/TWikiRelease04x02/twikiplugins/JSCalendarContrib/pub/TWiki/JSCalendarContrib/calendar.js =================================================================== --- twiki/branches/TWikiRelease04x02/twikiplugins/JSCalendarContrib/pub/TWiki/JSCalendarContrib/calendar.js 2008-09-09 12:57:04 UTC (rev 17489) +++ twiki/branches/TWikiRelease04x02/twikiplugins/JSCalendarContrib/pub/TWiki/JSCalendarContrib/calendar.js 2008-09-10 14:55:27 UTC (rev 17490) @@ -14,6 +14,9 @@ // $Id$ +// patched to make the calendar appear in the right position on IE7, using patch +// http://sourceforge.net/tracker/index.php?func=detail&aid=1679433&group_id=75569&atid=544287 + /** The Calendar object constructor. */ Calendar = function (firstDayOfWeek, dateStr, onSelected, onClose) { // member variables @@ -88,6 +91,7 @@ !/opera/i.test(navigator.userAgent) ); Calendar.is_ie5 = ( Calendar.is_ie && /msie 5\.0/i.test(navigator.userAgent) ); +Calendar.is_ie7up = ( Calendar.is_ie && parseFloat(navigator.userAgent.replace(/.*msie ([0-9]+).*/i, "$1" )) >= 7 ); /// detect Opera browser Calendar.is_opera = /opera/i.test(navigator.userAgent); @@ -1389,7 +1393,7 @@ document.body.appendChild(cp); var br = Calendar.getAbsolutePos(cp); document.body.removeChild(cp); - if (Calendar.is_ie) { + if (Calendar.is_ie && !Calendar.is_ie7up) { br.y += document.body.scrollTop; br.x += document.body.scrollLeft; } else { |