myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bom...@apache.org
Subject svn commit: r618758 - in /myfaces/tobago/branches/tobago-1.0.x: ./ theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tobago-menu.js
Date Tue, 05 Feb 2008 19:43:46 GMT
Author: bommel
Date: Tue Feb  5 11:43:39 2008
New Revision: 618758

URL: http://svn.apache.org/viewvc?rev=618758&view=rev
Log:
Merged revisions 618327 via svnmerge from 
https://svn.apache.org/repos/asf/myfaces/tobago/trunk

........
  r618327 | weber | 2008-02-04 18:01:18 +0100 (Mo, 04 Feb 2008) | 2 lines
  
  (TOBAGO-611) ajax reload of menu components don't work in IE
  <http://issues.apache.org/jira/browse/TOBAGO-611>
........

Modified:
    myfaces/tobago/branches/tobago-1.0.x/   (props changed)
    myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tobago-menu.js

Propchange: myfaces/tobago/branches/tobago-1.0.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Feb  5 11:43:39 2008
@@ -1 +1 @@
-/myfaces/tobago/trunk:1-603371,609568-609629,612250-612251,612282,612518,613455,613939,614278,614291,614642,615257,616717,617876
+/myfaces/tobago/trunk:1-603371,609568-609629,612250-612251,612282,612518,613455,613939,614278,614291,614642,615257,616717,617876,618327

Modified: myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tobago-menu.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tobago-menu.js?rev=618758&r1=618757&r2=618758&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tobago-menu.js
(original)
+++ myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tobago-menu.js
Tue Feb  5 11:43:39 2008
@@ -58,11 +58,9 @@
       menubar.removeChild(menubar.firstChild);
     }
     menubar.appendChild(htmlElement);
-    var subitems = createSubmenus(menubar.menu);
-    body.appendChild(subitems);
-    
 
-    
+    createSubmenus(menubar.menu, body);
+
     initMenuItems(menubar.menu);
     setItemWidth(menubar.menu);
     setItemPositions(menubar.menu);
@@ -76,9 +74,16 @@
   }
 }
 
-function createSubmenus(menu) {                   
-  var htmlElement = document.createElement('div');
-  htmlElement.className = "tobago-menuBar-submenuroot";
+function createSubmenus(menu, body) {
+  var id = menu.id + Tobago.SUB_COMPONENT_SEP + "submenuroot";
+  var htmlElement = Tobago.element(id);
+  if (!htmlElement) {
+    htmlElement = document.createElement('div');
+    htmlElement.className = "tobago-menuBar-submenuroot";
+    htmlElement.id = id;
+    body.appendChild(htmlElement);
+  }
+
   htmlElement.innerHTML = menu.toHtml(true);
   return htmlElement;
 }



Mime
View raw message