[interchange-cvs] interchange - heins modified lib/Vend/Menu.pm

[interchange-core@icdevgroup.org]

User:      heins
Date:      2003-04-19 18:26:10 GMT
Modified:  lib/Vend Menu.pm
Log:
* Fix flyout menu in anchor-down mode so that second and higher levels
  flies out right. This prevents problems selection options below
  the selected one.

Revision  Changes    Path
2.25      +10 -10    interchange/lib/Vend/Menu.pm


rev 2.25, prev_rev 2.24
Index: Menu.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Menu.pm,v
retrieving revision 2.24
retrieving revision 2.25
diff -u -r2.24 -r2.25
--- Menu.pm	10 Apr 2003 17:39:24 -0000	2.24
+++ Menu.pm	19 Apr 2003 18:26:10 -0000	2.25
@@ -1,6 +1,6 @@
 # Vend::Menu - Interchange menu processing routines
 #
-# $Id: Menu.pm,v 2.24 2003/04/10 17:39:24 mheins Exp $
+# $Id: Menu.pm,v 2.25 2003/04/19 18:26:10 mheins Exp $
 #
 # Copyright (C) 2002 Mike Heins, <mike@perusion.net>
 #
@@ -21,7 +21,7 @@
 
 package Vend::Menu;
 
-$VERSION = substr(q$Revision: 2.24 $, 10);
+$VERSION = substr(q$Revision: 2.25 $, 10);
 
 use Vend::Util;
 use strict;
@@ -672,8 +672,8 @@
 		if(l[${vpf}MV_CHILDREN] < 1) 
 			return;
 
-		var x = ${vpf}getRightX( obj ) + 1;
-		var y = ${vpf}getTopX( obj );
+		var x = ${vpf}getRightX( obj, currentlevel ) + 1;
+		var y = ${vpf}getTopX( obj, currentlevel );
 		var menu = fod.style;
 		menu.left = x + "px";
 		menu.top = y + "px";
@@ -692,13 +692,13 @@
 		fod.innerHTML = html;
 	}
 
-	function ${vpf}getRightX( obj )
+	function ${vpf}getRightX( obj, level )
 	{
 		if( ${vpf}browserType() == "other" )
 			return;
 		var pos = 0;
 		if( ${vpf}browserType() == "ie" )
-			if(${vpf}anchor_down == 1) 
+			if(${vpf}anchor_down == 1 && level == 0) 
 				pos = obj.getBoundingClientRect().left + 2;
 			else
 				pos = obj.getBoundingClientRect().right - 2;
@@ -710,20 +710,20 @@
 				x = x.offsetParent;
 			}
 			pos = n + obj.offsetLeft;
-			if(${vpf}anchor_down != 1)
+			if(${vpf}anchor_down != 1 || level > 0)
 				pos += obj.offsetWidth;
 		}
 		return pos;
 	}
 
-	function ${vpf}getTopX( obj )
+	function ${vpf}getTopX( obj, level )
 	{
 		if( ${vpf}browserType() == "other" )
 			return;
 
 		var pos = 0;
 		if( ${vpf}browserType() == "ie" )
-			if(${vpf}anchor_down) 
+			if(${vpf}anchor_down && level == 0) 
 				pos = obj.getBoundingClientRect().bottom + 2;
 			else
 				pos = obj.getBoundingClientRect().top - 2;
@@ -735,7 +735,7 @@
 				x = x.offsetParent;
 			}
 			pos = n + obj.offsetTop;
-			if(${vpf}anchor_down)
+			if(${vpf}anchor_down && level == 0)
 				pos += obj.offsetHeight;
 		}
 		return pos;