You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2013/10/29 14:25:32 UTC

svn commit: r1536703 - /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

Author: lofwyr
Date: Tue Oct 29 13:25:31 2013
New Revision: 1536703

URL: http://svn.apache.org/r1536703
Log:
TOBAGO-1280: Dropdown Menu did not work on toolbar commands

Modified:
    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

Modified: 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
URL: http://svn.apache.org/viewvc/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?rev=1536703&r1=1536702&r2=1536703&view=diff
==============================================================================
--- 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 (original)
+++ 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 Tue Oct 29 13:25:31 2013
@@ -209,7 +209,10 @@ Tobago.Menu.switchOn = function(menuBar,
       .on('focus', Tobago.Menu.open)
       .bind(compatibleKeyEvent(), Tobago.Menu.handelKey);
   var a = menu.children('a');
-  if (menu.parents(".tobago-toolBar").size() == 0 && menu.parents(".tobago-box-headerToolBar").size() == 0) {
+  if (menu.parents(".tobago-toolBar").size() == 0
+      && menu.parents(".tobago-box-headerToolBar").size() == 0
+      && menu.parents(".tobago-sheet-toolBar").size() == 0
+      && menu.parents(".tobago-tabGroup-toolBar").size() == 0) {
     a.trigger("focus");
   } else {
     // XXX the call in the previous line doesn't work with toolBar -> dropDown (don't know why), so using direct call