[richfaces-svn-commits] JBoss Rich Faces SVN: r18724 - in trunk/ui/iteration/ui/src/main: java/org/richfaces/renderkit and 1 other directories.

[richfaces-svn-commits at lists.jboss.org]

Author: abelevich
Date: 2010-08-17 13:08:54 -0400 (Tue, 17 Aug 2010)
New Revision: 18724

Modified:
   trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java
   trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/SubTableToggleControlRendererBase.java
   trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/subtable-toggler.js
Log:
fix event names, fix subtable toggler script

Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java
===================================================================
--- trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java	2010-08-17 16:51:49 UTC (rev 18723)
+++ trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java	2010-08-17 17:08:54 UTC (rev 18724)
@@ -78,10 +78,10 @@
     public abstract int getFrozenColumns();
     
     @Attribute(events=@EventName(value="selectionchange", defaultEvent=true))
-    public abstract String getOnselectionchange();
+    public abstract String getSelectionchange();
 
     @Attribute(events=@EventName("beforeselectionchange"))
-    public abstract String getOnbeforeselectionchange();
+    public abstract String getBeforeselectionchange();
 
     public String resolveClientId(FacesContext facesContext, UIComponent contextComponent, String metaComponentId) {
         if (SCROLL.equals(metaComponentId)) {

Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/SubTableToggleControlRendererBase.java
===================================================================
--- trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/SubTableToggleControlRendererBase.java	2010-08-17 16:51:49 UTC (rev 18723)
+++ trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/SubTableToggleControlRendererBase.java	2010-08-17 17:08:54 UTC (rev 18724)
@@ -48,15 +48,16 @@
 @ResourceDependencies(
     {@ResourceDependency(library = "javax.faces", name = "jsf.js"),
     @ResourceDependency(name = "richfaces.js"), 
-    @ResourceDependency(name = "subtable-toggler.js")
+    @ResourceDependency(name = "richfaces-event.js"),
+    @ResourceDependency(library="org.richfaces", name = "subtable-toggler.js")
 })
 public class SubTableToggleControlRendererBase extends RendererBase {
 
     private static final String DISPLAY_NONE = "display: none;";
 
-    private static final String UP_ICON_URL = "org.richfaces:up_icon.gif";
+    private static final String UP_ICON_URL = "org.richfaces/up_icon.gif";
 
-    private static final String DOWN_ICON_URL = "org.richfaces:down_icon.gif";
+    private static final String DOWN_ICON_URL = "org.richfaces/down_icon.gif";
     
     private static final String EXPAND_STATE = "expand";
 

Modified: trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/subtable-toggler.js
===================================================================
--- trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/subtable-toggler.js	2010-08-17 16:51:49 UTC (rev 18723)
+++ trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/subtable-toggler.js	2010-08-17 17:08:54 UTC (rev 18724)
@@ -8,8 +8,11 @@
         this.expandControl = options.expandControl;
         this.collapseControl = options.collapseControl;
         this.forId = options.forId;
+        this.element = $(document.getElementById(this.id));
         
-        richfaces.Event.bindById(this.id, this.eventName, this.toggle, this);
+        if(this.element && this.eventName) {
+        	this.element.bind(this.eventName, $.proxy(this.toggle, this));
+        }	
      };
      
      $.extend(richfaces.ui.SubTableToggler.prototype, (function () {