Author: krasnov
Date: 2007-01-18 07:03:06 -0500 (Thu, 18 Jan 2007)
New Revision: 71253
Modified:
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/Menu.js
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.js
Log:
merge -r 71251:71252
Modified:
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
---
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2007-01-18 11:45:05 UTC (rev 71252)
+++
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2007-01-18 12:03:06 UTC (rev 71253)
@@ -1,3 +1,8 @@
+2007-01-18 Vladimir Krasnov <[EMAIL PROTECTED]>
+
+ * Menu.js, Menu.js: added null reference checking for every getTree or
+ getMenu call
+
2007-01-18 Adar Wesley <[EMAIL PROTECTED]>
* SiteMapDataSource.cs: implemented logic of GetStartNode when
Modified:
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/Menu.js
===================================================================
---
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/Menu.js
2007-01-18 11:45:05 UTC (rev 71252)
+++
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/Menu.js
2007-01-18 12:03:06 UTC (rev 71253)
@@ -1,6 +1,8 @@
function Menu_OverItem (menuId, itemId, parentId) {
var menu = getMenu (menuId);
+ if (menu == null)
+ return;
var subm = getSubMenu (menuId, itemId);
if (subm.parentMenu == null && parentId != null)
subm.parentMenu = getSubMenu (menuId, parentId);
@@ -44,6 +46,8 @@
function Menu_OverDynamicLeafItem (menuId, itemId, parentId) {
var menu = getMenu (menuId);
+ if (menu == null)
+ return;
var subm = getSubMenu (menuId, parentId);
Menu_SetActive (menu, subm);
Menu_ShowMenu (subm);
@@ -53,6 +57,8 @@
function Menu_OverStaticLeafItem (menuId, itemId) {
var menu = getMenu (menuId);
+ if (menu == null)
+ return;
Menu_SetActive (menu, null);
if (menu.dynamicHover != null)
Menu_HilighItem (menuId, itemId, menu.staticHover,
menu.staticLinkHover);
@@ -73,6 +79,8 @@
function Menu_OutItem (menuId, itemId, parentId) {
var menu = getMenu (menuId);
+ if (menu == null)
+ return;
var subm = getSubMenu (menuId, itemId);
if (subm == null && parentId != null)
subm = getSubMenu (menuId, parentId);
@@ -88,6 +96,8 @@
function Menu_OverScrollBtn (menuId, parentId, updown) {
var menu = getMenu (menuId);
+ if (menu == null)
+ return;
var subm = getSubMenu (menuId, parentId);
Menu_SetActive (menu, subm);
Menu_ShowMenu (subm);
@@ -99,6 +109,8 @@
function Menu_OutScrollBtn (menuId, parentId, updown) {
var menu = getMenu (menuId);
+ if (menu == null)
+ return;
var subm = getSubMenu (menuId, parentId);
if (subm.scrollThread != null)
clearInterval (subm.scrollThread);
Modified:
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.js
===================================================================
---
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.js
2007-01-18 11:45:05 UTC (rev 71252)
+++
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.js
2007-01-18 12:03:06 UTC (rev 71253)
@@ -1,6 +1,8 @@
function TreeView_ToggleExpand (treeId, nodeId) {
var tree = getTree (treeId);
+ if (tree == null)
+ return;
var spanId = treeId + "_" + nodeId;
var node = document.getElementById (spanId);
var expand = node.style.display == "none";
@@ -49,6 +51,8 @@
{
var idArray = ids.split (" ");
var tree = getTree (idArray[0]);
+ if (tree == null)
+ return;
var spanId = idArray[0] + "_" + idArray[1];
var node = document.getElementById (spanId);
node.populated = true;
@@ -81,6 +85,8 @@
function TreeView_HoverNode (treeId, node)
{
var tree = getTree (treeId);
+ if (tree == null)
+ return;
if (tree.hoverClass != null) {
if (node.normalClass == null)
node.normalClass = node.className;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
