Author: gonzalo
Date: 2005-04-26 03:24:42 -0400 (Tue, 26 Apr 2005)
New Revision: 43581
Modified:
trunk/mcs/class/System.Web/System.Web.UI.WebControls/Calendar.cs
trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
Log:
2005-04-26 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* Calendar.cs: when the day is active, modify the text of the literal
control that holds the number, not the text of the TableCell. Also call
OnDayRender before updating that text. Fixes bug #74718.
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/Calendar.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/Calendar.cs
2005-04-26 07:10:37 UTC (rev 43580)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/Calendar.cs
2005-04-26 07:24:42 UTC (rev 43581)
@@ -1066,20 +1066,19 @@
TableCell dayCell = new TableCell ();
dayCell.ApplyStyle (currentDayStyle);
- dayCell.Controls.Add (new
LiteralControl (dayString));
+ LiteralControl number = new
LiteralControl (dayString);
+ dayCell.Controls.Add (number);
calDay.IsSelectable = isActive;
- if (calDay.IsSelectable)
- dayCell.Text =
GetCalendarLinkText (
- (begin
+ (crr * 7 + weekDay)).ToString (),
-
dayString,
+ OnDayRender (dayCell, calDay);
+ if (isActive)
+ number.Text =
GetCalendarLinkText ((begin + (crr * 7 + weekDay)).ToString (),
+
dayString,
currentDay.ToShortDateString (),
dayCell.ForeColor,
isActive);
- OnDayRender (dayCell, calDay);
dayCell.RenderControl (writer);
-
- currentDay = globCal.AddDays
(currentDay, 1);
+ currentDay = globCal.AddDays
(currentDay, 1);
}
writer.Write("</tr>");
}
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2005-04-26 07:10:37 UTC (rev 43580)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2005-04-26 07:24:42 UTC (rev 43581)
@@ -1,3 +1,9 @@
+2005-04-26 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
+
+ * Calendar.cs: when the day is active, modify the text of the literal
+ control that holds the number, not the text of the TableCell. Also call
+ OnDayRender before updating that text. Fixes bug #74718.
+
2005-04-22 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* DataKey.cs: Added virtual TrackViewState and IsTrackingViewState
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
