From 10407f7f6f1b28bd97b933fbdc1e4f6c3b3fe25f Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 17 Mar 2009 16:03:57 +0000 Subject: [PATCH 1/2] Fix for bug #3315 Monotone-Parent: 89b88978ce7a84af4dd6e2e230ede1c3ef700068 Monotone-Revision: f3feeb51f538aeefcb5e90999e37b0bb069c3eba Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2009-03-17T16:03:57 Monotone-Branch: ca.inverse.sogo --- UI/WebServerResources/generic.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js index c9fb9bdc6..9b0d5389d 100644 --- a/UI/WebServerResources/generic.js +++ b/UI/WebServerResources/generic.js @@ -698,7 +698,7 @@ function onMenuClickHandler(event) { function hideMenu(menuNode) { var onHide; - if (menuNode.submenu) { + if (menuNode && menuNode.submenu) { hideMenu(menuNode.submenu); menuNode.submenu = null; } From 70c0c0d919dae45acd247eb3f4aa85311c60de03 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 17 Mar 2009 19:38:05 +0000 Subject: [PATCH 2/2] Fix for bug #3315 Monotone-Parent: f3feeb51f538aeefcb5e90999e37b0bb069c3eba Monotone-Revision: b516b07191501368df1dfb16f25aee4b4fba7941 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2009-03-17T19:38:05 Monotone-Branch: ca.inverse.sogo --- UI/WebServerResources/generic.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js index 9b0d5389d..2c61e992f 100644 --- a/UI/WebServerResources/generic.js +++ b/UI/WebServerResources/generic.js @@ -698,7 +698,10 @@ function onMenuClickHandler(event) { function hideMenu(menuNode) { var onHide; - if (menuNode && menuNode.submenu) { + if (!menuNode) + return; + + if (menuNode.submenu) { hideMenu(menuNode.submenu); menuNode.submenu = null; }