[richfaces-svn-commits] JBoss Rich Faces SVN: r257 - in trunk/richfaces/simpleTogglePanel/src/main: resources/org/richfaces/renderkit/html/scripts and 1 other directories.

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

Author: nbelaevski
Date: 2007-04-03 15:42:23 -0400 (Tue, 03 Apr 2007)
New Revision: 257

Modified:
   trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java
   trunk/richfaces/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/scripts/simpleTogglePanel.js
   trunk/richfaces/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx
Log:
http://jira.jboss.com/jira/browse/RF-65 fixed

Modified: trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java
===================================================================
--- trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java	2007-04-03 19:14:54 UTC (rev 256)
+++ trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java	2007-04-03 19:42:23 UTC (rev 257)
@@ -153,19 +153,7 @@
 			// Server
 
 
-			//xxx by nick - denis - use org.ajax4jsf.framework.renderer.RendererUtils#getNestingForm(FacesContext, UIComponent)
-			RendererUtils rendererUtils = new RendererUtils();
-			UIForm Form= rendererUtils.getNestingForm(context, component);
-			String formId=null;
-			if (Form!=null){
-			 formId = Form.getClientId(context);
-			}
-			if(formId==null) {
-				throw new RuntimeException("simpleToogleControl (id=\"" + component.getClientId(context) + "\") did not find parent form.");
-			}
 			onClick.append("SimpleTogglePanelManager.toggleOnServer('")
-				.append(formId)
-				.append("','")
 				.append(component.getClientId(context))
 				.append("'")
 

Modified: trunk/richfaces/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/scripts/simpleTogglePanel.js
===================================================================
--- trunk/richfaces/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/scripts/simpleTogglePanel.js	2007-04-03 19:14:54 UTC (rev 256)
+++ trunk/richfaces/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/scripts/simpleTogglePanel.js	2007-04-03 19:42:23 UTC (rev 257)
@@ -75,9 +75,9 @@
     this.panels=this.panels.merge(tmp);
 }
 
-SimpleTogglePanelManager.toggleOnServer = function (formId,clientId) {
-	var parentForm = document.forms[formId];
-	if(!parentForm) return;
+SimpleTogglePanelManager.toggleOnServer = function (clientId) {
+	var parentForm = A4J.findForm($(clientId + "_header"));
+	if(!parentForm || !parentForm.appendChild /* findForm returns surrogate form object */) return;
 
 	var fInput = parentForm[clientId];
 	if(!fInput) {

Modified: trunk/richfaces/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx
===================================================================
--- trunk/richfaces/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx	2007-04-03 19:14:54 UTC (rev 256)
+++ trunk/richfaces/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx	2007-04-03 19:42:23 UTC (rev 257)
@@ -15,15 +15,11 @@
 new org.ajax4jsf.framework.resource.PrototypeScript(),
 new org.ajax4jsf.framework.ajax.AjaxScript(),
 new org.ajax4jsf.framework.ajax.ImageCacheScript(),
+/org/ajax4jsf/renderkit/html/scripts/form.js,
 /org/richfaces/renderkit/html/scripts/browser_info.js,
 scripts/simpleTogglePanel.js
 </h:scripts>
 
-	<jsp:scriptlet>
-		<![CDATA[org.richfaces.component.util.FormUtil.throwEnclFormReqExceptionIfNeed(context,component);]]>
-    </jsp:scriptlet>
-
-
     <div id="#{clientId}" x:passThruWithExclusions="id,value,styleClass"
          class="dr-stglpnl rich-stglpanel #{component.attributes['styleClass']}"
          style="width: #{component.attributes['width']}; #{component.attributes['style']};">
@@ -55,6 +51,7 @@
             ));
         </script>
 
+        <f:call name="utils.encodeBeginFormIfNessesary"/>
         <div id="#{clientId}_header"
              class="dr-stglpnl-h rich-stglpanel-header #{component.attributes['headerClass']}"
              style="position : relative;"