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 2014/09/10 10:22:11 UTC

svn commit: r1623935 - in /myfaces/tobago/branches/tobago-3.0.x: ./ tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/ tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/ tobago-example/tobago-example-demo/...

Author: lofwyr
Date: Wed Sep 10 08:22:11 2014
New Revision: 1623935

URL: http://svn.apache.org/r1623935
Log:
merged from trunk: 1622243,1622508
TOBAGO-939: RenderedPartially support for sheet and tabGroup

Added:
    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-tab.js
      - copied unchanged from r1622508, myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-tab.js
Modified:
    myfaces/tobago/branches/tobago-3.0.x/   (props changed)
    myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasRenderedPartially.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/DataAttributes.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet.xhtml   (contents, props changed)
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/01-ajax/tab-ajax.xhtml   (contents, props changed)
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/pom.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabGroupRenderer.java   (contents, props changed)
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
    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-sheet.js   (contents, props changed)
    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.js   (contents, props changed)

Propchange: myfaces/tobago/branches/tobago-3.0.x/
------------------------------------------------------------------------------
  Merged /myfaces/tobago/trunk:r1622243,1622508

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasRenderedPartially.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasRenderedPartially.java?rev=1623935&r1=1623934&r2=1623935&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasRenderedPartially.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasRenderedPartially.java Wed Sep 10 08:22:11 2014
@@ -47,9 +47,12 @@ public interface HasRenderedPartially {
    * If a literal is specified: to use more than one identifier the identifiers must be space delimited.
    * </p>
    * <p>
-   * Using this in a UISheet component this list indicates components to update when calling
+   * Using this in a UISheet or UITabGroup component this list indicates components to update when calling
    * internal AJAX requests like sort or paging commands.
-   * Don't forget to add the sheets id in that case, if needed.
+   * Don't forget to add the sheet-id or tagGroup-id in that case, if needed.
+   * </p>
+   * <p>
+   * You can also use @this for the component itself.
    * </p>
    */
    @TagAttribute

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/DataAttributes.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/DataAttributes.java?rev=1623935&r1=1623934&r2=1623935&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/DataAttributes.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/DataAttributes.java Wed Sep 10 08:22:11 2014
@@ -133,7 +133,7 @@ public final class DataAttributes {
   @Deprecated
   public static final String MONTHNAMES = MONTH_NAMES;
 
-  public static final String PARTIALLY = "data-tobago-partially";
+  public static final String PARTIAL_IDS = "data-tobago-partial-ids";
 
   public static final String PARTIAL_ACTION = "data-tobago-partial-action";
 

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet.xhtml?rev=1623935&r1=1623934&r2=1623935&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet.xhtml Wed Sep 10 08:22:11 2014
@@ -140,7 +140,7 @@
               stateChangeListener="#{demo.stateChangeListener}"
               sortActionListener="#{overviewController.sheetSorter}"
               selectable="#{overviewController.sheetConfig.selectable}"
-              renderedPartially=":page:header:headerInfo sheet">
+              renderedPartially="@this :page:header:headerInfo">
 <!--
       <f:facet name="reload">
         <tc:reload frequency="2000" />

Propchange: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet.xhtml
------------------------------------------------------------------------------
  Merged /myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet.xhtml:r1622508

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/01-ajax/tab-ajax.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/01-ajax/tab-ajax.xhtml?rev=1623935&r1=1623934&r2=1623935&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/01-ajax/tab-ajax.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/01-ajax/tab-ajax.xhtml Wed Sep 10 08:22:11 2014
@@ -29,7 +29,8 @@
       <tc:gridLayout rows="*;auto"/>
     </f:facet>
 
-    <tc:tabGroup id="tabMarsOuterForm2" switchType="reloadTab" selectedIndex="#{demo.tabState2}" immediate="true">
+    <tc:tabGroup id="tabMarsOuterForm2" switchType="reloadTab" selectedIndex="#{demo.tabState2}" immediate="true"
+        renderedPartially="@this :page:header:headerInfo">
 
       <tc:tabChangeListener type="org.apache.myfaces.tobago.example.demo.actionlistener.SimpleTabChangeListener"
                             binding="#{demo.tabChangeListener}"/>

Propchange: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/01-ajax/tab-ajax.xhtml
------------------------------------------------------------------------------
  Merged /myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/01-ajax/tab-ajax.xhtml:r1622508

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/pom.xml?rev=1623935&r1=1623934&r2=1623935&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/pom.xml Wed Sep 10 08:22:11 2014
@@ -60,7 +60,7 @@
             <configuration>
               <target>
                 <concat destfile="${project.build.directory}/javascript-min/standard/script/tobago.min.js" force="no">
-                  <filelist dir="${basedir}/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script" files="tobago.js,tobago-calendar.js,tobago-console.js,tobago-converter.js,tobago-in.js,tobago-layout.js,tobago-menu.js,tobago-overlay.js,tobago-popup.js,tobago-sheet.js,tobago-suggest.js,tobago-tree.js,tobago-utils.js" />
+                  <filelist dir="${basedir}/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script" files="tobago.js,tobago-calendar.js,tobago-console.js,tobago-converter.js,tobago-in.js,tobago-layout.js,tobago-menu.js,tobago-overlay.js,tobago-popup.js,tobago-sheet.js,tobago-suggest.js,tobago-tab.js,tobago-tree.js,tobago-utils.js" />
                 </concat>
                 <replaceregexp match="^.*//.*@DEV_ONLY.*$" replace="" byline="true">
                   <fileset dir="${project.build.directory}/javascript-min">

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java?rev=1623935&r1=1623934&r2=1623935&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java Wed Sep 10 08:22:11 2014
@@ -161,7 +161,7 @@ public class SheetRenderer extends Layou
     }
     final String[] clientIds = ComponentUtils.evaluateClientIds(facesContext, sheet, sheet.getRenderedPartially());
     if (clientIds.length > 0) {
-      writer.writeAttribute(DataAttributes.PARTIALLY, JsonUtils.encode(clientIds), true);
+      writer.writeAttribute(DataAttributes.PARTIAL_IDS, JsonUtils.encode(clientIds), true);
     }
     writer.writeAttribute(DataAttributes.SELECTION_MODE, sheet.getSelectable(), false);
     writer.writeAttribute(DataAttributes.FIRST, Integer.toString(sheet.getFirst()), false);

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabGroupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabGroupRenderer.java?rev=1623935&r1=1623934&r2=1623935&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabGroupRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabGroupRenderer.java Wed Sep 10 08:22:11 2014
@@ -37,9 +37,11 @@ import org.apache.myfaces.tobago.renderk
 import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
 import org.apache.myfaces.tobago.renderkit.css.Classes;
 import org.apache.myfaces.tobago.renderkit.css.Style;
+import org.apache.myfaces.tobago.renderkit.html.DataAttributes;
 import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
 import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
 import org.apache.myfaces.tobago.renderkit.html.HtmlInputTypes;
+import org.apache.myfaces.tobago.renderkit.html.JsonUtils;
 import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
 import org.apache.myfaces.tobago.renderkit.util.RenderUtils;
 import org.apache.myfaces.tobago.util.ComponentUtils;
@@ -106,6 +108,11 @@ public class TabGroupRenderer extends La
     HtmlRendererUtils.writeDataAttributes(facesContext, writer, tabGroup);
     writer.writeStyleAttribute(new Style(facesContext, tabGroup));
     writer.writeAttribute(HtmlAttributes.SWITCHTYPE, switchType, false);
+    final String[] clientIds
+        = ComponentUtils.evaluateClientIds(facesContext, tabGroup, tabGroup.getRenderedPartially());
+    if (clientIds.length > 0) {
+      writer.writeAttribute(DataAttributes.PARTIAL_IDS, JsonUtils.encode(clientIds), true);
+    }
 
     writer.startElement(HtmlElements.INPUT, null);
     writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.HIDDEN, false);

Propchange: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabGroupRenderer.java
------------------------------------------------------------------------------
  Merged /myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabGroupRenderer.java:r1622508

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml?rev=1623935&r1=1623934&r2=1623935&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml Wed Sep 10 08:22:11 2014
@@ -409,6 +409,7 @@
         <script name="script/tobago-popup.js"/>
         <script name="script/tobago-sheet.js"/>
         <script name="script/tobago-suggest.js"/>
+        <script name="script/tobago-tab.js"/>
         <script name="script/tobago-tree.js"/>
         <script name="script/tobago-utils.js"/>
         <style name="style/contrib/ui-lightness/jquery-ui-1.10.4.custom.css"/>

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-sheet.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-sheet.js?rev=1623935&r1=1623934&r2=1623935&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-sheet.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-sheet.js Wed Sep 10 08:22:11 2014
@@ -71,7 +71,7 @@ Tobago.Sheet.init = function(elements) {
         click != undefined ? click.partially : undefined,
         dblclick != undefined ? dblclick.action : undefined,
         dblclick != undefined ? dblclick.partially: undefined,
-        sheet.data("tobago-partially")); // type array
+        sheet.data("tobago-partial-ids")); // type array
   });
 
   Tobago.Sheet.setup2(sheets);

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-sheet.js
------------------------------------------------------------------------------
  Merged /myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-sheet.js:r1622508

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.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.js?rev=1623935&r1=1623934&r2=1623935&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.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.js Wed Sep 10 08:22:11 2014
@@ -2316,136 +2316,6 @@ Tobago.registerListener(Tobago.ToolBar.i
 Tobago.registerListener(Tobago.ToolBar.init, Tobago.Phase.AFTER_UPDATE);
 
 // ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// TabGroup
-
-Tobago.TabGroup = {};
-
-/**
- * Initializes the tab-groups.
- * @param elements  a jQuery object to initialize (ajax) or null for initializing the whole document (full load).
- */
-Tobago.TabGroup.init = function(elements) {
-
-  var tabGroups = Tobago.Utils.selectWidthJQuery(elements, ".tobago-tabGroup");
-
-  // initialize the tab header elements
-  // client case
-  tabGroups.filter("[switchType='client']").each(function() {
-    jQuery(this).find(".tobago-tabGroup-headerInner").first()
-      .children(".tobago-tab").not(".tobago-tab-markup-disabled").click(function() {
-          var activeIndex = Tobago.TabGroup.updateHidden(jQuery(this));
-          jQuery(this).siblings(".tobago-tab-markup-selected").removeClass("tobago-tab-markup-selected");
-          jQuery(this).addClass("tobago-tab-markup-selected");
-          var tabGroup = jQuery(this).parents(".tobago-tabGroup:first");
-          tabGroup.children(".tobago-tab-content-markup-selected").removeClass("tobago-tab-content-markup-selected");
-          tabGroup.children(".tobago-tab-content[tabgroupindex=" + activeIndex + "]")
-              .addClass("tobago-tab-content-markup-selected");
-          // scroll the tabs, if necessary
-          var header = jQuery(this).parents(".tobago-tabGroup-header:first");
-          Tobago.TabGroup.ensureScrollPosition(header);
-        })
-  });
-
-  // initialize the tab header elements
-  // reload tab case
-  tabGroups.filter("[switchType='reloadTab']").each(function() {
-    jQuery(this).find(".tobago-tabGroup-headerInner").first()
-        .children(".tobago-tab").not(".tobago-tab-markup-disabled").click(function() {
-          var activeIndex = Tobago.TabGroup.updateHidden(jQuery(this));
-          console.debug("todo: ajax reload, activeIndex=" + activeIndex); // @DEV_ONLY
-          var tabGroup = jQuery(this).parents(".tobago-tabGroup:first");
-          Tobago.Updater.update(tabGroup, tabGroup.attr("id"), tabGroup.attr("id"), {});
-        })
-  });
-
-  // initialize the tab header elements
-  // reload page case
-  tabGroups.filter("[switchType='reloadPage']").each(function() {
-    jQuery(this).find(".tobago-tabGroup-headerInner").first()
-      .children(".tobago-tab").not(".tobago-tab-markup-disabled").click(function() {
-          var activeIndex = Tobago.TabGroup.updateHidden(jQuery(this));
-          console.debug("todo: full reload, activeIndex=" + activeIndex); // @DEV_ONLY
-          var tabGroup = jQuery(this).parents(".tobago-tabGroup:first");
-          Tobago.submitAction(tabGroup.eq(0), tabGroup.attr("id"));
-        })
-  });
-
-  // initialize previous button
-  tabGroups.find("[data-tobago-tabgroup-toolbar-prev]").click(function() {
-    var tabGroup = jQuery(this).parents(".tobago-tabGroup:first");
-    var selected = tabGroup.find(".tobago-tab-markup-selected");
-    // the nearest of the previous siblings, which are not disabled
-    selected.prevAll(":not(.tobago-tab-markup-disabled):first").click();
-  });
-
-  // initialize next button
-  tabGroups.find("[data-tobago-tabgroup-toolbar-next]").click(function() {
-    var tabGroup = jQuery(this).parents(".tobago-tabGroup:first");
-    var selected = tabGroup.find(".tobago-tab-markup-selected");
-    // the nearest of the next siblings, which are not disabled
-    selected.nextAll(":not(.tobago-tab-markup-disabled):first").click();
-  });
-
-  // init scroll position
-  var header = tabGroups.find(".tobago-tabGroup-header");
-  header.each(function() {
-    Tobago.TabGroup.ensureScrollPosition(jQuery(this));
-  });
-
-    // tool tips
-  tabGroups.each(function() {
-    var tabGroup = jQuery(this);
-    tabGroup.find(".tobago-tab").each(function() {
-      var tab = jQuery(this);
-      var tabContent = tabGroup.find(".tobago-tab-content[tabgroupindex=" + tab.attr("tabgroupindex") + "]");
-      tabContent.attr("title", tab.attr("title"));
-    });
-  });
-
-
-  // initialize menu
-  // XXX ":last" is dangerous, please define e.g. a unique class for "menu"
-//  tabGroups.find(".tobago-tabGroupToolBar-button:last").find(".tobago-menu").click(function() {
-//    var index = jQuery(this).prevAll().size();
-//    var tabGroup = jQuery(this).parents(".tobago-tabGroup:first");
-//    var selected = tabGroup.find(".tobago-tab").eq(index).click();
-//  });
-
-  // XXX hack for webkit to avoid scrollbars in box
-//  jQuery('.tobago-tabGroup').hide();
-//  jQuery('.tobago-tabGroup').show();
-};
-
-/**
- * Update the hidden field for the active index.
- * @param tab is a jQuery object which represents the clicked tab area.
- */
-Tobago.TabGroup.updateHidden = function(tab) {
-  var tabGroup = tab.parents(".tobago-tabGroup:first");
-  var hidden = tabGroup.children("input");
-  var activeIndex = tab.attr("tabgroupindex");
-  hidden.val(activeIndex);
-  return activeIndex;
-};
-
-Tobago.TabGroup.ensureScrollPosition = function (header) {
-  var tab = header.find(".tobago-tab-markup-selected");
-  if (tab.length > 0) {
-    var tabRight = tab.position().left + tab.outerWidth() - header.outerWidth();
-    if (tabRight > 0) {
-      header.scrollLeft(header.scrollLeft() + tabRight + 1); // +1 to avoid rounding problems
-    }
-    var tabLeft = tab.position().left;
-    if (tabLeft < 0) {
-      header.scrollLeft(header.scrollLeft() + tabLeft);
-    }
-  }
-};
-
-Tobago.registerListener(Tobago.TabGroup.init, Tobago.Phase.DOCUMENT_READY);
-Tobago.registerListener(Tobago.TabGroup.init, Tobago.Phase.AFTER_UPDATE);
-
-// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Commands
 
 Tobago.Command = {};

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.js
------------------------------------------------------------------------------
  Merged /myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js:r1622508