myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r1625973 - in /myfaces/tobago/branches/tobago-3.0.x: ./ tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myface...
Date Thu, 18 Sep 2014 13:27:54 GMT
Author: lofwyr
Date: Thu Sep 18 13:27:53 2014
New Revision: 1625973

URL: http://svn.apache.org/r1625973
Log:
Merged from trunk
TOBAGO-939 - RenderedPartially support for sheet and tabGroup [from revision 1625968]
TOBAGO-939 - RenderedPartially support for sheet and tabGroup
- clean up [from revision 1625972]

Modified:
    myfaces/tobago/branches/tobago-3.0.x/   (props changed)
    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/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-sheet.js
  (contents, props changed)

Propchange: myfaces/tobago/branches/tobago-3.0.x/
------------------------------------------------------------------------------
  Merged /myfaces/tobago/trunk:r1625968,1625972

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=1625973&r1=1625972&r2=1625973&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
Thu Sep 18 13:27:53 2014
@@ -852,9 +852,13 @@ public class SheetRenderer extends Layou
                     facesContext, UICommand.COMPONENT_TYPE, RendererTypes.LINK, sorterId);
                 column.getFacets().put(Facets.SORTER, sortCommand);
               }
+              String[] clientIds = ComponentUtils.evaluateClientIds(facesContext, sheet,
sheet.getRenderedPartially());
+              if (clientIds.length == 0) {
+                clientIds = new String[]{sheet.getClientId(facesContext)};
+              }
               final CommandMap map = new CommandMap();
-              final Command click = new Command(sortCommand.getClientId(facesContext),
-                  null, null, null, new String[]{sheet.getClientId(facesContext)}, null,
null, null, null, null);
+              final Command click = new Command(
+                  sortCommand.getClientId(facesContext), null, null, null, clientIds, null,
null, null, null, null);
               map.setClick(click);
               writer.writeAttribute(DataAttributes.COMMANDS, JsonUtils.encode(map), true);
 

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=1625973&r1=1625972&r2=1625973&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
Thu Sep 18 13:27:53 2014
@@ -99,19 +99,6 @@ Tobago.Sheet.init = function(elements) {
 Tobago.registerListener(Tobago.Sheet.init, Tobago.Phase.DOCUMENT_READY);
 Tobago.registerListener(Tobago.Sheet.init, Tobago.Phase.AFTER_UPDATE);
 
-
-Tobago.Sheet.prototype.setupSortHeaders = function() {
-  var sheet = this;
-  jQuery(Tobago.Utils.escapeClientId(sheet.id)).find(".tobago-sheet-header[data-tobago-sorterId]").each(function()
{
-
-    jQuery(this).click({sheet: sheet, sorterId: jQuery(this).data("tobago-sorterId")}, function(event)
{
-
-      event.data.sheet.reloadWithAction(jQuery(this), event.data.sorterId);
-      event.stopPropagation();
-    });
-  });
-};
-
 Tobago.Sheet.prototype.setupArrowPaging = function(linkBox) {
     for (var i = 0; i < linkBox.childNodes.length; i++) {
         var child = linkBox.childNodes[i];
@@ -514,7 +501,6 @@ Tobago.Sheet.prototype.setup = function(
     });
   }
 
-  this.setupSortHeaders();
   this.setupPagePaging();
   this.setupRowPaging();
 

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



Mime
View raw message