kivitendo rebranding

[kivitendo-erp.git] / js / dhtmlsuite / menu-for-applications.js

diff --git a/js/dhtmlsuite/menu-for-applications.js b/js/dhtmlsuite/menu-for-applications.js
index ce18180..7a7d76e 100644 (file)
--- a/js/dhtmlsuite/menu-for-applications.js
+++ b/js/dhtmlsuite/menu-for-applications.js
@@ -1597,7 +1597,7 @@ DHTMLSuite.menuBar = function()
        this.targetId = false;\r
        this.activeSubItemsOnMouseOver = false;\r
        this.menuItemCssPrefix = false;\r
-       this.createIframesForOldIeBrowsers = true;\r
+       this.createIframesForOldIeBrowsers = false;\r
        if(!standardObjectsCreated)DHTMLSuite.createStandardObjects();  \r
        \r
        \r
@@ -2227,6 +2227,13 @@ DHTMLSuite.menuBar.prototype = {
                                shortRef.style.left = DHTMLSuite.commonObj.getLeftPos(this.menuItem_objects[parentId].divElement) + 'px';\r
                                shortRef.style.top = (DHTMLSuite.commonObj.getTopPos(this.menuItem_objects[parentId].divElement) + this.menuItem_objects[parentId].divElement.offsetHeight) + 'px';\r
                        }else{\r
+              var too_large = DHTMLSuite.commonObj.getLeftPos(this.menuItem_objects[parentId].divElement)\r
+                            + this.menuItem_objects[parentId].divElement.offsetWidth\r
+                            + shortRef.offsetWidth\r
+                            > $('#main_menu_div').width();\r
+              if (too_large)\r
+                shortRef.style.left = (DHTMLSuite.commonObj.getLeftPos(this.menuItem_objects[parentId].divElement) - shortRef.offsetWidth) + 'px';\r
+              else\r
                                shortRef.style.left = (DHTMLSuite.commonObj.getLeftPos(this.menuItem_objects[parentId].divElement) + this.menuItem_objects[parentId].divElement.offsetWidth) + 'px';\r
                                shortRef.style.top = (DHTMLSuite.commonObj.getTopPos(this.menuItem_objects[parentId].divElement)) + 'px';               \r
                        }       \r
@@ -2335,6 +2342,15 @@ DHTMLSuite.menuBar.prototype = {
        }\r
        // }}}  \r
        ,\r
+    unsetMenuBarState : function() { this.menuBarState = false },\r
+    changeMenuBarState: function (target) {\r
+          var parentId = target.id.replace(/[^0-9]/gi,'');\r
+          this.menuBarState = !this.menuBarState;\r
+       this.hideSubMenus();\r
+          if(this.menuBarState) {\r
+               this.__expandGroup(parentId);\r
+       }\r
+    },\r
        // {{{ __setBasicEvents()\r
     /**\r
      * Set basic events for the menu widget.\r
@@ -2344,10 +2360,17 @@ DHTMLSuite.menuBar.prototype = {
      */        \r
        __setBasicEvents : function()\r
        {\r
-               DHTMLSuite.commonObj.addEvent(document.documentElement,"click",this.hideSubMenus);              \r
         var menu = this;\r
+        $('div.DHTMLSuite_menuBar_sub').click(function() { menu.hideSubMenus(); menu.unsetMenuBarState() });\r
+        $('div.DHTMLSuite_menuBar_top > div > div[objectref!="0"]').click(function() { menu.changeMenuBarState(this) });\r
+        $('div.DHTMLSuite_menuBar_top').click(function(e) {\r
+          if ($(e.target).attr('class') == 'DHTMLSuite_menuBar_top') { menu.hideSubMenus(); menu.unsetMenuBarState() }\r
+        });\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