You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2014/08/04 17:48:05 UTC
svn commit: r1615626 -
/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-menu.js
Author: weber
Date: Mon Aug 4 15:48:04 2014
New Revision: 1615626
URL: http://svn.apache.org/r1615626
Log:
TOBAGO-1410 - Menu Dropdown did not collapse after partially action
Merged from trunk: rev 1615615
Modified:
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-menu.js (contents, props changed)
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-menu.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-menu.js?rev=1615626&r1=1615625&r2=1615626&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-menu.js (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-menu.js Mon Aug 4 15:48:04 2014
@@ -388,7 +388,14 @@ Tobago.Menu.init = function(elements) {
});
// prevent default
- var menu = Tobago.Utils.selectWidthJQuery(elements, ".tobago-menu").not(".tobago-menu-markup-top");
+ var menu;
+ if (elements) {
+ // this is ajax case: the commands are just removed from elements, so get them from the data store
+ menu = Tobago.Utils.selectWidthJQuery(elements, ".tobago-menu-markup-top")
+ .tobagoMenu_findSubMenu().find('.tobago-menu').andSelf();
+ } else {
+ menu = jQuery(".tobago-menu").not(".tobago-menu-markup-top");
+ }
menu.each(function() {
var menuItem = jQuery(this);
if (menuItem.children("ol").size() > 0) {
Propchange: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-menu.js
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Aug 4 15:48:04 2014
@@ -0,0 +1,3 @@
+/myfaces/tobago/branches/tobago-1.5.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-menu.js:1356585,1357124
+/myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-menu.js:1226794-1341423
+/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-menu.js:1571193,1571804,1571816,1571941,1571945,1571962,1571966,1576730,1589960,1591854,1600239,1600818,1601860,1615615