[richfaces-svn-commits] JBoss Rich Faces SVN: r6395 - in trunk/sandbox/ui/inplaceInput/src: main/java/org/richfaces/renderkit and 2 other directories.

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

Author: abelevich
Date: 2008-02-28 06:21:47 -0500 (Thu, 28 Feb 2008)
New Revision: 6395

Modified:
   trunk/sandbox/ui/inplaceInput/src/main/config/component/inplaceinput.xml
   trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java
   trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js
   trunk/sandbox/ui/inplaceInput/src/test/java/org/richfaces/component/InplaceInputComponentTest.java
Log:
fix test, remove applyFromControlsOnly attr

Modified: trunk/sandbox/ui/inplaceInput/src/main/config/component/inplaceinput.xml
===================================================================
--- trunk/sandbox/ui/inplaceInput/src/main/config/component/inplaceinput.xml	2008-02-28 10:48:33 UTC (rev 6394)
+++ trunk/sandbox/ui/inplaceInput/src/main/config/component/inplaceinput.xml	2008-02-28 11:21:47 UTC (rev 6395)
@@ -71,12 +71,6 @@
 		  		<defaultvalue>false</defaultvalue>
 		  	</property>
 		  	<property>
-		  		<name>applyFromControlsOnly</name>
-		  		<classname>boolean</classname>
-		  		<description></description>
-		  		<defaultvalue>false</defaultvalue>
-		  	</property>
-		  	<property>
 		  		<name>editEvent</name>
 		  		<classname>java.lang.String</classname>
 		  		<description></description>

Modified: trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java
===================================================================
--- trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java	2008-02-28 10:48:33 UTC (rev 6394)
+++ trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java	2008-02-28 11:21:47 UTC (rev 6395)
@@ -117,7 +117,6 @@
     	ScriptOptions options = new ScriptOptions(component);
     	options.addOption("defaultLabel");
     	options.addOption("showControls");
-    	options.addOption("applyFromControlsOnly");
     	options.addOption("editEvent");
     	options.addOption("selectOnEdit");
     	options.addOption("verticalPosition", component.getAttributes().get("controlsVerticalPosition"));

Modified: trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js
===================================================================
--- trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js	2008-02-28 10:48:33 UTC (rev 6394)
+++ trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js	2008-02-28 11:21:47 UTC (rev 6395)
@@ -125,7 +125,7 @@
 			return;
 		}
 		
-		if (!this.attributes.applyFromControlsOnly) {
+		if (!this.attributes.showControls) {
 			this.inputProcessing();
 		}
 	},

Modified: trunk/sandbox/ui/inplaceInput/src/test/java/org/richfaces/component/InplaceInputComponentTest.java
===================================================================
--- trunk/sandbox/ui/inplaceInput/src/test/java/org/richfaces/component/InplaceInputComponentTest.java	2008-02-28 10:48:33 UTC (rev 6394)
+++ trunk/sandbox/ui/inplaceInput/src/test/java/org/richfaces/component/InplaceInputComponentTest.java	2008-02-28 11:21:47 UTC (rev 6395)
@@ -26,6 +26,8 @@
 	static {
 		javaScripts.add("a4j_3_2_0-SNAPSHOTorg.ajax4jsf.javascript.PrototypeScript");
 		javaScripts.add("a4j_3_2_0-SNAPSHOTscripts/inplaceinput.js");
+		javaScripts.add("a4j_3_2_0-SNAPSHOTscripts/utils.js");
+		
 	}
 	
 	public InplaceInputComponentTest(String name) {
@@ -72,8 +74,6 @@
 			if (item.getFirstChild() != null) {
 				String scriptBodyString = item.getFirstChild().toString();
 				assertTrue(scriptBodyString.contains("Richfaces.InplaceInput"));
-				assertTrue(scriptBodyString.contains("Richfaces.InplaceInput.CLASSES"));
-				
 			}
 			if (StringUtils.isNotBlank(srcAttr)) {
 				boolean found = false;