From richfaces-svn-commits at lists.jboss.org Wed Sep 16 18:07:55 2009
Content-Type: multipart/mixed; boundary="===============9130027514245180985=="
MIME-Version: 1.0
From: richfaces-svn-commits at lists.jboss.org
To: richfaces-svn-commits at lists.jboss.org
Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r15599 - in
 branches/community/3.3.X/ui/editor/src: main/templates and 1 other
 directories.
Date: Wed, 16 Sep 2009 18:07:55 -0400
Message-ID: <200909162207.n8GM7tB5006246@svn01.web.mwc.hst.phx2.redhat.com>

--===============9130027514245180985==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: nbelaevski
Date: 2009-09-16 18:07:54 -0400 (Wed, 16 Sep 2009)
New Revision: 15599

Modified:
   branches/community/3.3.X/ui/editor/src/main/config/component/editor.xml
   branches/community/3.3.X/ui/editor/src/main/templates/editor.jspx
   branches/community/3.3.X/ui/editor/src/test/java/org/richfaces/component=
/EditorComponentTest.java
Log:
https://jira.jboss.org/jira/browse/RF-7040

Modified: branches/community/3.3.X/ui/editor/src/main/config/component/edit=
or.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/community/3.3.X/ui/editor/src/main/config/component/editor.xml=
	2009-09-16 17:04:15 UTC (rev 15598)
+++ branches/community/3.3.X/ui/editor/src/main/config/component/editor.xml=
	2009-09-16 22:07:54 UTC (rev 15599)
@@ -197,5 +197,10 @@
 			<classname>java.lang.String</classname>
 			<description>A localized user presentable name for this component.</des=
cription>
 		</property>
+		<property>
+			<name>inputElementType</name>
+			<classname>java.lang.String</classname>
+			<defaultvalue>"textarea"</defaultvalue>
+		</property>
 	</component>
 </components>

Modified: branches/community/3.3.X/ui/editor/src/main/templates/editor.jspx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/community/3.3.X/ui/editor/src/main/templates/editor.jspx	2009-=
09-16 17:04:15 UTC (rev 15598)
+++ branches/community/3.3.X/ui/editor/src/main/templates/editor.jspx	2009-=
09-16 22:07:54 UTC (rev 15599)
@@ -21,11 +21,30 @@
 		    if(shouldRenderTinyMCE(component)) {
     	]]>
 	</jsp:scriptlet>
+		=

+    <jsp:scriptlet>
+	<![CDATA[
+	    if ("input".equals(component.getAttributes().get("inputElementType"))=
) {
+   	]]>
+	</jsp:scriptlet>
+			<input type=3D"text" id=3D"#{clientId}TextArea" name=3D"#{clientId}Text=
Area"
+				style=3D"visibility: hidden" =

+				value=3D"#{this:getFormattedComponentStringValue(context, component)}"=
 />
+    <jsp:scriptlet>
+	<![CDATA[
+	    } else {
+   	]]>
+	</jsp:scriptlet>
+			<textarea id=3D"#{clientId}TextArea" name=3D"#{clientId}TextArea"
+				style=3D"visibility: hidden">
+				#{this:getFormattedComponentStringValue(context, component)}
+			</textarea>
+    <jsp:scriptlet>
+	<![CDATA[
+		}
+   	]]>
+	</jsp:scriptlet>
 			=

-		<textarea id=3D"#{clientId}TextArea" name=3D"#{clientId}TextArea"
-			style=3D"visibility: hidden">
-			#{this:getFormattedComponentStringValue(context, component)}
-		</textarea>
         <script type=3D"text/javascript">
 				=

 			<f:call name=3D"writeEditorCustomPluginsParameters" />

Modified: branches/community/3.3.X/ui/editor/src/test/java/org/richfaces/co=
mponent/EditorComponentTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/community/3.3.X/ui/editor/src/test/java/org/richfaces/componen=
t/EditorComponentTest.java	2009-09-16 17:04:15 UTC (rev 15598)
+++ branches/community/3.3.X/ui/editor/src/test/java/org/richfaces/componen=
t/EditorComponentTest.java	2009-09-16 22:07:54 UTC (rev 15599)
@@ -155,6 +155,27 @@
 		assertEquals("Some value", value);
 	}
 =

+	public void testEditorRenderingInput() throws Exception {
+		editor.getAttributes().put("inputElementType", "input");
+		=

+		HtmlPage page =3D renderView();
+		assertNotNull(page);
+		HtmlElement htmlDiv =3D page.getHtmlElementById(editor
+				.getClientId(facesContext));
+		assertNotNull(htmlDiv);
+		assertEquals(htmlDiv.getTagName(), "div");
+		HtmlElement input =3D page.getHtmlElementById(editor
+				.getClientId(facesContext)
+				+ UIEditor.EDITOR_TEXT_AREA_ID_SUFFIX);
+		assertNotNull(input);
+		assertEquals(input.getTagName(), "input");
+		String style =3D input.getAttribute("style");
+		assertNotNull(style);
+		assertTrue(style.contains("visibility: hidden"));
+		String value =3D input.getAttribute("value");
+		assertEquals("Some value", value);
+	}
+	=

 	/* (non-Javadoc)
 	 * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#tearDown()
 	 */


--===============9130027514245180985==--