X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fdhtmlsuite%2Fmenu-for-applications.js;h=bf23469a8eb23f6f77fd782bf29b6fd96d9770d6;hb=958b82d600cebec78ff208257b1fd348ee0439bf;hp=48d030336b082ecf09f9affeedcba85c44211eb8;hpb=7b6a3af9cc51b982853b572028acc58c8349e2b6;p=kivitendo-erp.git

diff --git a/js/dhtmlsuite/menu-for-applications.js b/js/dhtmlsuite/menu-for-applications.js
index 48d030336..bf23469a8 100644
--- a/js/dhtmlsuite/menu-for-applications.js
+++ b/js/dhtmlsuite/menu-for-applications.js
@@ -242,6 +242,7 @@ DHTMLSuite.common.prototype = {
 	getTopPos : function(inputObj)
 	{		
 	  var returnValue = inputObj.offsetTop;
+      if (returnValue > 700) returnValue = 0;
 	  while((inputObj = inputObj.offsetParent) != null){
 	  	if(inputObj.tagName!='HTML'){
 	  		returnValue += (inputObj.offsetTop - inputObj.scrollTop);
@@ -1137,7 +1138,7 @@ DHTMLSuite.menuItem = function()
 	var cssPrefix;							// Css prefix for the menu items.
 	var modelItemRef;						// Reference to menuModelItem
 
-	this.layoutCSS = 'menu-item.css';
+//	this.layoutCSS = 'menu-item.css';
 	this.cssPrefix = 'DHTMLSuite_';
 	
 	if(!standardObjectsCreated)DHTMLSuite.createStandardObjects();	
@@ -1159,7 +1160,7 @@ DHTMLSuite.menuItem.prototype =
 	*/
 	createItem : function(menuModelItemObj)
 	{
-		DHTMLSuite.commonObj.loadCSS(this.layoutCSS);	// Load css
+//		DHTMLSuite.commonObj.loadCSS(this.layoutCSS);	// Load css
 		
 		DHTMLSuite.variableStorage.arrayOfDhtmlSuiteObjects[this.objectIndex] = this;
 			
@@ -1593,7 +1594,7 @@ DHTMLSuite.menuBar = function()
 	var globalObjectIndex;			// Global index of this object - used to refer to the object of this class outside
 	this.cssPrefix = 'DHTMLSuite_';
 	this.menuItemLayoutCss = false;	// false = use default for the menuItem class.
-	this.layoutCSS = 'menu-bar.css';
+//	this.layoutCSS = 'menu-bar.css';
 	this.menuBarBackgroundImage = 'menu_strip_bg.jpg';
 	this.menuItem_objects = new Array();
 	DHTMLSuite.variableStorage.menuBar_highlightedItems = new Array();
@@ -1629,7 +1630,7 @@ DHTMLSuite.menuBar.prototype = {
 	init : function()
 	{
 		
-		DHTMLSuite.commonObj.loadCSS(this.layoutCSS);	
+//		DHTMLSuite.commonObj.loadCSS(this.layoutCSS);	
 		this.__createDivs();	// Create general divs
 		this.__createMenuItems();	// Create menu items
 		this.__setBasicEvents();	// Set basic events.
@@ -2231,6 +2232,14 @@ DHTMLSuite.menuBar.prototype = {
 		try{
 			var shortRef = this.submenuGroups[parentId];	
 			
+			if( shortRef.style.visible == 'hidden' )
+		  {
+			  shortRef.style.display = 'none';
+			  return;
+		  }
+			else
+			  shortRef.style.display = 'block';
+			
 			var depth = this.menuItems[parentId].depth;
 			var dir = this.menuItemObj.submenuType[depth];
 			if(dir=='top'){			
@@ -2376,12 +2385,10 @@ DHTMLSuite.menuBar.prototype = {
         $('div.DHTMLSuite_menuBar_top').click(function(e) {
           if ($(e.target).attr('class') == 'DHTMLSuite_menuBar_top') { menu.hideSubMenus(); menu.unsetMenuBarState() }
         });
-        $('#win1').load(function(){
-            $('#win1').contents().mousedown(function(){
-                menu.hideSubMenus();
-                menu.menuBarState = false;
-            });
-        })
+        $('#content').mousedown(function(){
+            menu.hideSubMenus();
+            menu.menuBarState = false;
+        });
 	}
 }