[richfaces-svn-commits] JBoss Rich Faces SVN: r5581 - in trunk/ui/menu-components/src/main: resources/org/richfaces/renderkit/html/scripts and 1 other directory.

[richfaces-svn-commits at lists.jboss.org]

Author: akushunin
Date: 2008-01-24 06:13:49 -0500 (Thu, 24 Jan 2008)
New Revision: 5581

Modified:
   trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/AbstractMenuRenderer.java
   trunk/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js
Log:
http://jira.jboss.com/jira/browse/RF-1993

Modified: trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/AbstractMenuRenderer.java
===================================================================
--- trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/AbstractMenuRenderer.java	2008-01-24 09:57:48 UTC (rev 5580)
+++ trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/AbstractMenuRenderer.java	2008-01-24 11:13:49 UTC (rev 5581)
@@ -173,7 +173,6 @@
 
 		AjaxContext ajaxContext = AjaxContext.getCurrentInstance();
 		Set renderedAreas = ajaxContext.getAjaxRenderedAreas();
-		renderedAreas.add(clientId + "_menu_iframe");
 		renderedAreas.add(clientId + "_menu_script");
 	}
 

Modified: trunk/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js
===================================================================
--- trunk/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js	2008-01-24 09:57:48 UTC (rev 5580)
+++ trunk/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js	2008-01-24 11:13:49 UTC (rev 5581)
@@ -143,8 +143,9 @@
 	
 	initIFrame: function(layer) {
 				var menu = $(layer);			
-				new Insertion.Before(menu,
+				var iframe = new Insertion.Before(menu,
 				"<iframe src=\"javascript:''\" id=\"" + menu.id + "_iframe\" style=\" position: absolute; z-index: 1;\" class=\"underneath_iframe\">" + "</iframe>");
+				return iframe; 
 	},
 
 	ieSelectWorkAround: function(menuName, on){
@@ -154,8 +155,7 @@
 			var menu = $(menuName);
           	var iframe = $(menuName + "_iframe");
            	if(!iframe&&on){
-           		this.initIFrame(menu);
-           		iframe = $(menuName + "_iframe");
+           		iframe = this.initIFrame(menu);           		
            	}
 			var nsfix = (this.NS ? 7 : 0);
 			if(on){