Merge branch 'master' of vc.linet-services.de:public/lx-office-erp

diff --git a/js/dhtmlsuite/menu-for-applications.js b/js/dhtmlsuite/menu-for-applications.js
index ce18180..7896f91 100644 (file)
--- a/js/dhtmlsuite/menu-for-applications.js
+++ b/js/dhtmlsuite/menu-for-applications.js
@@ -2335,6 +2335,7 @@ DHTMLSuite.menuBar.prototype = {
        }\r
        // }}}  \r
        ,\r
+    unsetMenuBarState : function() { this.menuBarState = false },\r
        // {{{ __setBasicEvents()\r
     /**\r
      * Set basic events for the menu widget.\r
@@ -2346,8 +2347,12 @@ DHTMLSuite.menuBar.prototype = {
        {\r
                DHTMLSuite.commonObj.addEvent(document.documentElement,"click",this.hideSubMenus);              \r
         var menu = this;\r
+        $(document).mousedown(function(){ menu.unsetMenuBarState(); });\r
         $('#win1').load(function(){\r
-            $('#win1').contents().mousedown(menu.hideSubMenus);\r
+            $('#win1').contents().mousedown(function(){\r
+                menu.hideSubMenus();\r
+                menu.menuBarState = false;\r
+            });\r
         })\r
        }\r
 }\r