Author: igorz
Date: 2007-08-30 10:01:20 -0400 (Thu, 30 Aug 2007)
New Revision: 85051
Modified:
trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
trunk/mcs/class/System.Web/System.Web.UI.WebControls/Menu.cs
trunk/mcs/class/System.Web/System.Web.UI.WebControls/Menu.js
Log:
2007-08-30 Igor Zelmanovich <[EMAIL PROTECTED]>
* Menu.cs:
* Menu.js:
make Menu work in multi form environment.
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2007-08-30 14:00:05 UTC (rev 85050)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2007-08-30 14:01:20 UTC (rev 85051)
@@ -1,5 +1,11 @@
2007-08-30 Igor Zelmanovich <[EMAIL PROTECTED]>
+ * Menu.cs:
+ * Menu.js:
+ make Menu work in multi form environment.
+
+2007-08-30 Igor Zelmanovich <[EMAIL PROTECTED]>
+
* ListControl.cs: fixed selected items state management.
2007-08-30 Igor Zelmanovich <[EMAIL PROTECTED]>
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/Menu.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/Menu.cs
2007-08-30 14:00:05 UTC (rev 85050)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/Menu.cs
2007-08-30 14:01:20 UTC (rev 85051)
@@ -1163,6 +1163,7 @@
string cmenu = ClientID + "_data";
string script = string.Concat ("var ", cmenu, " = new
Object ();\n");
+ script += string.Format ("{0}.webForm = {1};\n", cmenu,
Page.IsMultiForm ? Page.theForm : "window");
script += string.Format ("{0}.disappearAfter = {1};\n",
cmenu, ClientScriptManager.GetScriptLiteral (DisappearAfter));
script += string.Format ("{0}.vertical = {1};\n",
cmenu, ClientScriptManager.GetScriptLiteral (Orientation ==
Orientation.Vertical));
if (DynamicHorizontalOffset != 0)
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/Menu.js
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/Menu.js
2007-08-30 14:00:05 UTC (rev 85050)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/Menu.js
2007-08-30 14:01:20 UTC (rev 85051)
@@ -16,9 +16,9 @@
if (menu.dvo != null) offy += menu.dvo;
if (menu.vertical || parentId != null)
- Menu_Reposition (item, subm, item.offsetWidth + offx,
offy);
+ Menu_Reposition (menu, item, subm, item.offsetWidth +
offx, offy);
else
- Menu_Reposition (item, subm, offx, item.offsetHeight +
offy);
+ Menu_Reposition (menu, item, subm, offx,
item.offsetHeight + offy);
subm.initialLeft = subm.style.left;
subm.initialTop = subm.style.top;
@@ -152,10 +152,10 @@
Menu_ShowMenu (subm.parentMenu);
}
-function Menu_Reposition (it, elem, offx, offy)
+function Menu_Reposition (menu, it, elem, offx, offy)
{
- var itPos = WebForm_GetElementPosition(it);
- var elemPos = WebForm_GetElementPosition(elem);
+ var itPos = menu.webForm.WebForm_GetElementPosition(it);
+ var elemPos = menu.webForm.WebForm_GetElementPosition(elem);
elem.style.left = (elem.offsetLeft - elemPos.x + itPos.x + offx) + "px";
elem.style.top = (elem.offsetTop - elemPos.y + itPos.y + offy) + "px";
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches