JBoss Rich Faces SVN: r1615 - branches/3.0.2/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-07-13 05:40:58 -0400 (Fri, 13 Jul 2007)
New Revision: 1615
Modified:
branches/3.0.2/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java
Log:
http://jira.jboss.com/jira/browse/RF-454
Modified: branches/3.0.2/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java
===================================================================
--- branches/3.0.2/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java 2007-07-13 01:21:25 UTC (rev 1614)
+++ branches/3.0.2/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java 2007-07-13 09:40:58 UTC (rev 1615)
@@ -54,8 +54,7 @@
ComponentVariables variables = ComponentsVariableResolver.getVariables(
this, component);
variables.setVariable("dataTable", dataTable);
- if (!(scroller.getPageCount(dataTable) == 1)
- || (scroller.isRenderIfSinglePage())) {
+ if (scroller.isRendered()) {
variables.setVariable("rendered", Boolean.TRUE);
super.encodeBegin(context, component);
}
17 years, 6 months
JBoss Rich Faces SVN: r1614 - in trunk: docs/ajaxguide/en/src/main/docbook/modules and 5 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2007-07-12 21:21:25 -0400 (Thu, 12 Jul 2007)
New Revision: 1614
Modified:
trunk/docs/ajaxguide/en/src/main/docbook/modules/a4jUGstart.xml
trunk/docs/ajaxguide/pom.xml
trunk/docs/xslt/src/main/resources/en/f.xsl
trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java
trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/ConfigurableXMLFilter.java
trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/nekko/NekkoXMLFilter.java
trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/tidy/TidyXMLFilter.java
trunk/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/ToXHTMLStream.java
Log:
Fix rendering empty html attributes in the neko xml filter
Modified: trunk/docs/ajaxguide/en/src/main/docbook/modules/a4jUGstart.xml
===================================================================
--- trunk/docs/ajaxguide/en/src/main/docbook/modules/a4jUGstart.xml 2007-07-12 21:38:37 UTC (rev 1613)
+++ trunk/docs/ajaxguide/en/src/main/docbook/modules/a4jUGstart.xml 2007-07-13 01:21:25 UTC (rev 1614)
@@ -255,8 +255,4 @@
<title>Other Relevant Resources</title>
<para><ulink url="http://jsf.javabeat.net/articles/2007/06/introduction-to-ajax4jsf/3">Introduction to Ajax4Jsf - Sample Application</ulink> by Shunmuga Raja</para>
</section>
- <section id="Relevant_src">
- <title>Other Relevant Resources</title>
- <para><ulink url="http://jsf.javabeat.net/articles/2007/06/introduction-to-ajax4jsf/3">Introduction to Ajax4Jsf - Sample Application</ulink> by Shunmuga Raja</para>
- </section>
</chapter>
Modified: trunk/docs/ajaxguide/pom.xml
===================================================================
--- trunk/docs/ajaxguide/pom.xml 2007-07-12 21:38:37 UTC (rev 1613)
+++ trunk/docs/ajaxguide/pom.xml 2007-07-13 01:21:25 UTC (rev 1614)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>docs</artifactId>
<groupId>org.richfaces</groupId>
<version>3.1.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.docs</groupId>
- <artifactId>ajaxguide</artifactId>
- <packaging>pom</packaging>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.docs</groupId>
+ <artifactId>ajaxguide</artifactId>
+ <packaging>pom</packaging>
<description>Ajax4jsf user guide</description>
<pluginRepositories>
<pluginRepository>
@@ -43,10 +43,10 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>
- core
- </artifactId>
+ <groupId>
+ org.richfaces.ui
+ </groupId>
+ <artifactId>core</artifactId>
<version>
${project.version}
</version>
@@ -96,13 +96,13 @@
</goals>
</execution>
</executions>
- <dependencies>
+ <dependencies>
<dependency>
- <groupId>net.sf.saxon</groupId>
- <artifactId>saxon</artifactId>
- <version>8.7</version>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon</artifactId>
+ <version>8.7</version>
</dependency>
- </dependencies>
+ </dependencies>
<configuration>
<transformationSets>
<transformationSet>
@@ -130,13 +130,17 @@
<parameter>
<name>lang</name>
<value>
- ${basedir}/src/main/docbook
+ ${basedir}${file.separator}src${file.separator}main${file.separator}docbook
</value>
</parameter>
<parameter>
<name>title</name>
<value>${project.name}</value>
</parameter>
+ <parameter>
+ <name>separator</name>
+ <value>${file.separator}</value>
+ </parameter>
</parameters>
</transformationSet>
</transformationSets>
@@ -149,7 +153,7 @@
<version>${project.version}</version>
<executions>
<execution>
- <id>generate</id>
+ <id>generate</id>
<!--
<phase>compile</phase>
-->
@@ -158,7 +162,7 @@
</goals>
</execution>
<execution>
- <id>resources</id>
+ <id>resources</id>
<!--
<phase>compile</phase>
-->
@@ -253,5 +257,5 @@
<module>en</module>
</modules>
-</project>
-
+</project>
+
Modified: trunk/docs/xslt/src/main/resources/en/f.xsl
===================================================================
--- trunk/docs/xslt/src/main/resources/en/f.xsl 2007-07-12 21:38:37 UTC (rev 1613)
+++ trunk/docs/xslt/src/main/resources/en/f.xsl 2007-07-13 01:21:25 UTC (rev 1614)
@@ -5,6 +5,7 @@
<xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/>
<xsl:param name="lang" />
<xsl:param name="title" />
+ <xsl:param name="separator" />
<xsl:template match="javaee:taglib | taglib">
<xsl:variable name="excluded-tag-names">header2,header3,header4,header5,header6</xsl:variable>
@@ -47,7 +48,7 @@
<xsl:attribute name="id"><xsl:value-of select="$tag_name"/></xsl:attribute>
<title><<xsl:value-of select="concat($prefix,':', $tag_name)" />></title>
- <xsl:for-each select="document(concat($lang, '/included/',$tag_name, '.desc.xml'))/*">
+ <xsl:for-each select="document(concat('file:/',$lang, $separator,'included',$separator,$tag_name, '.desc.xml'))/*">
<xsl:copy-of select="./*"/>
</xsl:for-each>
<table>
@@ -75,7 +76,7 @@
</tbody>
</tgroup>
</table>
- <xsl:for-each select="document(concat($lang,'/included/',$tag_name, '.xml'))/*">
+ <xsl:for-each select="document(concat('file:/',$lang, $separator,'included',$separator,$tag_name, '.xml'))/*">
<xsl:copy-of select="./*"/>
</xsl:for-each>
</section>
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java 2007-07-12 21:38:37 UTC (rev 1613)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java 2007-07-13 01:21:25 UTC (rev 1614)
@@ -73,6 +73,10 @@
private static final String INIT_PARAMETER_PREFIX = "org.ajax4jsf.xmlfilter.";
+ public static final String TEXT_HTML = "text/html";
+
+ public static final String APPLICATION_XHTML_XML = "application/xhtml+xml";
+
public BaseFilter filter;
public void setFilter(BaseFilter filter) {
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/ConfigurableXMLFilter.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/ConfigurableXMLFilter.java 2007-07-12 21:38:37 UTC (rev 1613)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/ConfigurableXMLFilter.java 2007-07-13 01:21:25 UTC (rev 1614)
@@ -27,10 +27,16 @@
*/
public class ConfigurableXMLFilter extends BaseXMLFilter {
- private static final Log log = LogFactory
+ public static final String NONE = "NONE";
+
+ public static final String NEKO = "NEKO";
+
+ public static final String TIDY = "TIDY";
+
+ private static final Log log = LogFactory
.getLog(ConfigurableXMLFilter.class);
- private static final String PARSERS_LIST_PARAMETER = "org.ajax4jsf.xmlparsers";
+ private static final String PARSERS_LIST_PARAMETER = "org.ajax4jsf.xmlparser.ORDER";
private static final String VIEW_ID_PATTERN_PARAMETER = "org.ajax4jsf.xmlparser.";
@@ -62,11 +68,11 @@
for (int i = parsersNames.length - 1; i >= 0; i--) {
String parserName = parsersNames[i];
ParserConfig parserConfig;
- if ("TIDY".equals(parserName)) {
+ if (TIDY.equals(parserName)) {
parserConfig = new TidyParserConfig();
- } else if ("NEKO".equals(parserName)) {
+ } else if (NEKO.equals(parserName)) {
parserConfig = new NekoParserConfig();
- } else if ("PASS".equals(parserName)) {
+ } else if (NONE.equals(parserName)) {
parserConfig = new PassParserConfig();
} else {
throw new ServletException(
@@ -101,8 +107,8 @@
HtmlParser parser = null;
if (isAjax || isForcexml()) {
parser = parsers.getParser(viewId, mimetype);
- } else if (mimetype.startsWith("text/html")
- || mimetype.startsWith("application/xhtml+xml")) {
+ } else if (mimetype.startsWith(TEXT_HTML)
+ || mimetype.startsWith(APPLICATION_XHTML_XML)) {
parser = new FastHtmlParser();
}
return parser;
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/nekko/NekkoXMLFilter.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/nekko/NekkoXMLFilter.java 2007-07-12 21:38:37 UTC (rev 1613)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/nekko/NekkoXMLFilter.java 2007-07-13 01:21:25 UTC (rev 1614)
@@ -40,7 +40,7 @@
HtmlParser parser = null;
if( isAjax ){
parser = getXmlParser();
- } else if (mimetype.startsWith("text/html") || mimetype.startsWith("application/xhtml+xml")) {
+ } else if (mimetype.startsWith(TEXT_HTML) || mimetype.startsWith(APPLICATION_XHTML_XML)) {
parser = new FastHtmlParser();
} else {
return null;
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/tidy/TidyXMLFilter.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/tidy/TidyXMLFilter.java 2007-07-12 21:38:37 UTC (rev 1613)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/tidy/TidyXMLFilter.java 2007-07-13 01:21:25 UTC (rev 1614)
@@ -68,7 +68,7 @@
*/
protected HtmlParser getParser(String mime, boolean isAjax, String viewId) {
// For non-ajax, parse only html types !
- if (isAjax || mime.startsWith("text/html") || mime.startsWith("application/xhtml+xml")) {
+ if (isAjax || mime.startsWith(TEXT_HTML) || mime.startsWith(APPLICATION_XHTML_XML)) {
if(isAjax || isForcexml()){
TidyParser parser ;
parser = new TidyParser(getTidyProperties());
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/ToXHTMLStream.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/ToXHTMLStream.java 2007-07-12 21:38:37 UTC (rev 1613)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/ToXHTMLStream.java 2007-07-13 01:21:25 UTC (rev 1614)
@@ -1084,11 +1084,14 @@
{
writer.write(' ');
- if ( ((value.length() == 0) || value.equalsIgnoreCase(name))
+ if ( ((value.length() == 0) )
&& elemDesc != null
&& elemDesc.isAttrFlagSet(name, ElemDesc.ATTREMPTY))
{
writer.write(name);
+ writer.write("=\"");
+ writeAttrString(writer, name, this.getEncoding());
+ writer.write('"');
}
else
{
17 years, 6 months
JBoss Rich Faces SVN: r1613 - in trunk/samples/richfaces-demo/src/main/webapp/templates: include and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: SergeySmirnov
Date: 2007-07-12 17:38:37 -0400 (Thu, 12 Jul 2007)
New Revision: 1613
Modified:
trunk/samples/richfaces-demo/src/main/webapp/templates/component-sample.xhtml
trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml
trunk/samples/richfaces-demo/src/main/webapp/templates/include/dynamic-css.xhtml
trunk/samples/richfaces-demo/src/main/webapp/templates/include/footer.xhtml
trunk/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml
trunk/samples/richfaces-demo/src/main/webapp/templates/include/references.xhtml
Log:
avoiding problem with extra html inside the templates
Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/component-sample.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/templates/component-sample.xhtml 2007-07-12 18:15:30 UTC (rev 1612)
+++ trunk/samples/richfaces-demo/src/main/webapp/templates/component-sample.xhtml 2007-07-12 21:38:37 UTC (rev 1613)
@@ -4,6 +4,8 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:rich="http://richfaces.ajax4jsf.org/rich">
-<ui:insert name="sample"/>
-<ui:insert name="sources"/>
+ <ui:composition>
+ <ui:insert name="sample"/>
+ <ui:insert name="sources"/>
+ </ui:composition>
</html>
Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml 2007-07-12 18:15:30 UTC (rev 1612)
+++ trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml 2007-07-12 21:38:37 UTC (rev 1613)
@@ -4,6 +4,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:a4j="http://richfaces.org/ajax"
xmlns:rich="http://richfaces.ajax4jsf.org/rich">
+<ui:composition>
<rich:panel styleClass="panel_menu">
<table border="0" cellpadding="3" cellspacing="1">
<tbody>
@@ -23,5 +24,6 @@
</tbody>
</table>
</rich:panel>
+</ui:composition>
</html>
Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/include/dynamic-css.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/templates/include/dynamic-css.xhtml 2007-07-12 18:15:30 UTC (rev 1612)
+++ trunk/samples/richfaces-demo/src/main/webapp/templates/include/dynamic-css.xhtml 2007-07-12 21:38:37 UTC (rev 1613)
@@ -3,6 +3,7 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:a4j="http://richfaces.org/ajax">
+<ui:composition>
<style type="text/css">
body{
background-image : url(${facesContext.externalContext.requestContextPath}/images/page_bg.gif);
@@ -26,5 +27,6 @@
background-image : url(${facesContext.externalContext.requestContextPath}/images/tabpanel_custom/tab_active_bg.gif);
}
</style>
+</ui:composition>
</html>
Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/include/footer.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/templates/include/footer.xhtml 2007-07-12 18:15:30 UTC (rev 1612)
+++ trunk/samples/richfaces-demo/src/main/webapp/templates/include/footer.xhtml 2007-07-12 21:38:37 UTC (rev 1613)
@@ -3,6 +3,8 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:a4j="http://richfaces.org/ajax">
+<ui:composition>
Footer will be here
+</ui:composition>>
</html>
Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml 2007-07-12 18:15:30 UTC (rev 1612)
+++ trunk/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml 2007-07-12 21:38:37 UTC (rev 1613)
@@ -4,6 +4,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:a4j="http://richfaces.org/ajax"
xmlns:rich="http://richfaces.ajax4jsf.org/rich">
+<ui:composition>
<div class="page_brick"></div>
<table class="top_navbar" cellpadding="0" cellspacing="0" border="0">
<tbody>
@@ -127,4 +128,5 @@
</tbody>
</table>
</h:form>
+</ui:composition>
</html>
\ No newline at end of file
Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/include/references.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/templates/include/references.xhtml 2007-07-12 18:15:30 UTC (rev 1612)
+++ trunk/samples/richfaces-demo/src/main/webapp/templates/include/references.xhtml 2007-07-12 21:38:37 UTC (rev 1613)
@@ -4,6 +4,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:a4j="http://richfaces.org/ajax"
xmlns:rich="http://richfaces.ajax4jsf.org/rich">
+<ui:composition>
<rich:panel styleClass="panel_documents">
<strong>#{componentNavigator.currentComponent.name}</strong>
<ul>
@@ -12,5 +13,6 @@
<li><h:outputLink value="#{componentNavigator.currentComponent.javaDocLocation}">Component Class Documentation</h:outputLink></li>
</ul>
</rich:panel>
+</ui:composition>
</html>
17 years, 6 months
JBoss Rich Faces SVN: r1612 - branches/3.0.2/richfaces/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-07-12 14:15:30 -0400 (Thu, 12 Jul 2007)
New Revision: 1612
Modified:
branches/3.0.2/richfaces/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js
Log:
http://jira.jboss.com/jira/browse/RF-371
Modified: branches/3.0.2/richfaces/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js
===================================================================
--- branches/3.0.2/richfaces/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js 2007-07-12 16:32:57 UTC (rev 1611)
+++ branches/3.0.2/richfaces/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js 2007-07-12 18:15:30 UTC (rev 1612)
@@ -86,9 +86,7 @@
Event.observe(this.input, "change", this.eventInputChange);
}
this.initialized = true;
- this.setInitialValue();
- if (RichFaces.navigatorType() == "MSIE")
- Event.observe(window, "load", this.setInitialValue.bindAsEventListener(this)); //FIX RFA-190
+ Event.observe(window, "load", this.setInitialValue.bindAsEventListener(this)); //FIX RFA-190
//Event.observe($(input), "propertychange", this.setInitialValue.bindAsEventListener(this));
},
@@ -364,4 +362,4 @@
return str.replace(/^\s+|\s+$/, '');
}
-}
\ No newline at end of file
+}
17 years, 6 months
JBoss Rich Faces SVN: r1611 - trunk/ui/modal-panel/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: vkukharchuk
Date: 2007-07-12 12:32:57 -0400 (Thu, 12 Jul 2007)
New Revision: 1611
Modified:
trunk/ui/modal-panel/src/main/config/component/modalPanel.xml
Log:
http://jira.jboss.com/jira/browse/RF-428
Modified: trunk/ui/modal-panel/src/main/config/component/modalPanel.xml
===================================================================
--- trunk/ui/modal-panel/src/main/config/component/modalPanel.xml 2007-07-12 16:22:27 UTC (rev 1610)
+++ trunk/ui/modal-panel/src/main/config/component/modalPanel.xml 2007-07-12 16:32:57 UTC (rev 1611)
@@ -143,13 +143,29 @@
</property>
<property>
+ <name>showWhenRendered</name>
+ <classname>boolean</classname>
+ <description>
+ If 'true' modalPanel should be rendered after first page loading
+ </description>
+ </property>
+
+ <property>
+ <name>keepVisualState</name>
+ <classname>boolean</classname>
+ <description>
+ If 'true' modalPanel should save state after submittion
+ </description>
+ </property>
+
+ <property>
<name>shadowDepth</name>
<classname>java.lang.String</classname>
<description>
Pop-up shadow depth for suggestion content
</description>
- </property>
-
+ </property>
+
<property>
<name>onshow</name>
<classname>java.lang.String</classname>
17 years, 6 months
JBoss Rich Faces SVN: r1610 - in branches/3.0.2/richfaces/suggestionbox/src/main: resources/org/richfaces/renderkit/html/scripts and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-07-12 12:22:27 -0400 (Thu, 12 Jul 2007)
New Revision: 1610
Modified:
branches/3.0.2/richfaces/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java
branches/3.0.2/richfaces/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js
branches/3.0.2/richfaces/suggestionbox/src/main/resources/org/richfaces/renderkit/html/templates/popup.jspx
Log:
http://jira.jboss.com/jira/browse/RF-441
Modified: branches/3.0.2/richfaces/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java
===================================================================
--- branches/3.0.2/richfaces/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java 2007-07-12 15:42:50 UTC (rev 1609)
+++ branches/3.0.2/richfaces/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java 2007-07-12 16:22:27 UTC (rev 1610)
@@ -185,10 +185,6 @@
StringBuffer clazz = new StringBuffer(
"dr-sb-common-container rich-sb-common-container");
- Object popupClass = attributes.get("popupClass");
- if (null != popupClass) {
- clazz.append(" ").append(popupClass);
- }
writer.writeAttribute("class", clazz, "popupClass");
int zIndex = suggestionBox.getZindex();
Modified: branches/3.0.2/richfaces/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js
===================================================================
--- branches/3.0.2/richfaces/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js 2007-07-12 15:42:50 UTC (rev 1609)
+++ branches/3.0.2/richfaces/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js 2007-07-12 16:22:27 UTC (rev 1610)
@@ -91,6 +91,10 @@
}
this.onScrollListener = this.onScroll.bindAsEventListener(this);
+
+ if (options.popupClass)
+ Element.addClassName(document.getElementsByClassName("dr-sb-ext-decor-3",
+ this.update)[0], options.popupClass);
},
onBoxKeyPress: function(event) {
Modified: branches/3.0.2/richfaces/suggestionbox/src/main/resources/org/richfaces/renderkit/html/templates/popup.jspx
===================================================================
--- branches/3.0.2/richfaces/suggestionbox/src/main/resources/org/richfaces/renderkit/html/templates/popup.jspx 2007-07-12 15:42:50 UTC (rev 1609)
+++ branches/3.0.2/richfaces/suggestionbox/src/main/resources/org/richfaces/renderkit/html/templates/popup.jspx 2007-07-12 16:22:27 UTC (rev 1610)
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<f:template xmlns:f='http:/jsf.exadel.com/template'
xmlns:u='http:/jsf.exadel.com/template/util'
- xmlns="http://www.w3.org/1999/xhtml">
+ xmlns="http://www.w3.org/1999/xhtml"
+ component="org.richfaces.component.UISuggestionBox">
<div class="dr-sb-ext-decor-1 rich-sb-ext-decor-1">
<div class="dr-sb-ext-decor-2 rich-sb-ext-decor-2">
17 years, 6 months
JBoss Rich Faces SVN: r1609 - branches/3.0.2/sandbox/calendar/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2007-07-12 11:42:50 -0400 (Thu, 12 Jul 2007)
New Revision: 1609
Added:
branches/3.0.2/sandbox/calendar/src/main/java/org/richfaces/renderkit/CurrentDateEvent.java
Log:
added
Added: branches/3.0.2/sandbox/calendar/src/main/java/org/richfaces/renderkit/CurrentDateEvent.java
===================================================================
--- branches/3.0.2/sandbox/calendar/src/main/java/org/richfaces/renderkit/CurrentDateEvent.java (rev 0)
+++ branches/3.0.2/sandbox/calendar/src/main/java/org/richfaces/renderkit/CurrentDateEvent.java 2007-07-12 15:42:50 UTC (rev 1609)
@@ -0,0 +1,24 @@
+package org.richfaces.renderkit;
+
+import javax.faces.component.UIComponent;
+import javax.faces.event.FacesEvent;
+import javax.faces.event.FacesListener;
+
+public class CurrentDateEvent extends FacesEvent {
+
+
+ public CurrentDateEvent(UIComponent component) {
+ super(component);
+ }
+
+ public boolean isAppropriateListener(FacesListener listener) {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public void processListener(FacesListener listener) {
+ // TODO Auto-generated method stub
+ }
+
+
+}
Property changes on: branches/3.0.2/sandbox/calendar/src/main/java/org/richfaces/renderkit/CurrentDateEvent.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
17 years, 6 months
JBoss Rich Faces SVN: r1608 - in branches/3.0.2/sandbox/calendar/src/main/java/org/richfaces: renderkit and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2007-07-12 11:42:13 -0400 (Thu, 12 Jul 2007)
New Revision: 1608
Modified:
branches/3.0.2/sandbox/calendar/src/main/java/org/richfaces/component/UICalendar.java
branches/3.0.2/sandbox/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
Log:
currentDateEvent Added
Modified: branches/3.0.2/sandbox/calendar/src/main/java/org/richfaces/component/UICalendar.java
===================================================================
--- branches/3.0.2/sandbox/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-07-12 14:56:06 UTC (rev 1607)
+++ branches/3.0.2/sandbox/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-07-12 15:42:13 UTC (rev 1608)
@@ -30,14 +30,12 @@
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
-import java.util.Map;
import java.util.Set;
import java.util.TimeZone;
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
import javax.faces.component.UIViewRoot;
-import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
import javax.faces.convert.ConverterException;
@@ -51,6 +49,7 @@
import org.ajax4jsf.framework.ajax.AjaxEvent;
import org.richfaces.renderkit.CalendarDataModelItemAdaptor;
import org.richfaces.renderkit.CalendarRendererBase;
+import org.richfaces.renderkit.CurrentDateEvent;
// import org.richfaces.renderkit.html.BaseGradient.Data;
@@ -91,6 +90,7 @@
// currentDate processing -------------------------------------------------
private Date currentDate = null;
+
public Converter getConverter(FacesContext context, UICalendar calendar) {
@@ -124,7 +124,14 @@
Date valueString = calendar.getCurrentDate();
return valueString.toString();
}
+
+ public void decode(FacesContext context) {
+
+ super.decode(context);
+
+ }
+
// --------------------------------------------------------
private int getLastDayOfWeek(Calendar calendar) {
@@ -186,9 +193,14 @@
FacesContext facesContext = FacesContext.getCurrentInstance();
AjaxContext ajaxContext = AjaxContext
.getCurrentInstance(facesContext);
-
- ajaxContext.setResponseData(getPreload());
+ ajaxContext.setResponseData(getPreload());
}
+
+ //added recently
+ if (event instanceof CurrentDateEvent){
+ event.getPhaseId();
+ event.getComponent();
+ }
}
public Object getPreload() {
Modified: branches/3.0.2/sandbox/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
===================================================================
--- branches/3.0.2/sandbox/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-07-12 14:56:06 UTC (rev 1607)
+++ branches/3.0.2/sandbox/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-07-12 15:42:13 UTC (rev 1608)
@@ -22,16 +22,15 @@
package org.richfaces.renderkit;
import java.io.IOException;
-import java.util.AbstractCollection;
import java.util.Calendar;
import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
+import javax.faces.event.FacesEvent;
+import javax.faces.event.PhaseId;
import org.ajax4jsf.framework.ajax.AjaxEvent;
import org.ajax4jsf.framework.renderer.AjaxRendererUtils;
@@ -39,55 +38,70 @@
import org.ajax4jsf.framework.util.javascript.JSFunctionDefinition;
import org.ajax4jsf.framework.util.javascript.JSReference;
import org.ajax4jsf.framework.util.javascript.ScriptUtils;
-import org.richfaces.component.CalendarDataModel;
-import org.richfaces.component.CalendarDataModelItem;
import org.richfaces.component.UICalendar;
import org.richfaces.component.util.HtmlUtil;
/**
- * @author Nick Belaevski - mailto:nbelaevski@exadel.com
- * created 08.06.2007
- *
+ * @author Nick Belaevski - mailto:nbelaevski@exadel.com created 08.06.2007
+ *
*/
public class CalendarRendererBase extends TemplateEncoderRendererBase {
public static final String DATE_SCROLL = "DateScroll";
-
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.ajax4jsf.framework.renderer.RendererBase#getComponentClass()
*/
protected Class getComponentClass() {
return UICalendar.class;
}
-
+
public String qualifySize(Object size) {
if (size == null) {
return "";
}
return HtmlUtil.qualifySize(size.toString());
}
-
+ public Date convertCurrentDate(String currentDateString) {
+
+ Calendar calendar = Calendar.getInstance();
+ calendar.clear();
+ calendar.set(Calendar.DATE, 1);
+ int idx = currentDateString.indexOf('/');
+ calendar.set(Calendar.MONTH, Integer.parseInt(currentDateString
+ .substring(0, idx)));
+ calendar.set(Calendar.YEAR, Integer.parseInt(currentDateString
+ .substring(idx + 1)));
+
+ return calendar.getTime();
+
+ }
+
protected void doDecode(FacesContext context, UIComponent component) {
// TODO Auto-generated method stub
super.doDecode(context, component);
String clientId = component.getClientId(context);
- Map requestParameterMap = context.getExternalContext().getRequestParameterMap();
- String currentDateString = (String) requestParameterMap.get(clientId + DATE_SCROLL);
+ Map requestParameterMap = context.getExternalContext()
+ .getRequestParameterMap();
+
+ String currentDateString = (String) requestParameterMap.get(clientId
+ + DATE_SCROLL);
+
if (currentDateString != null) {
- Calendar calendar = Calendar.getInstance();
- calendar.clear();
- calendar.set(Calendar.DATE, 1);
- int idx = currentDateString.indexOf('/');
- calendar.set(Calendar.MONTH, Integer.parseInt(currentDateString.substring(0, idx)));
- calendar.set(Calendar.YEAR, Integer.parseInt(currentDateString.substring(idx + 1)));
-
- ((UICalendar) component).setCurrentDate(calendar.getTime());
+ ((UICalendar) component)
+ .setCurrentDate(convertCurrentDate(currentDateString));
+ }
- new AjaxEvent(component).queue();
- }
+ CurrentDateEvent ev = new CurrentDateEvent(component) ;
+ ev.setPhaseId(PhaseId.PROCESS_VALIDATIONS);
+ ev.queue();
+
+ new AjaxEvent(component).queue();
+
}
public void encodeChildren(FacesContext context, UIComponent calendar)
@@ -95,15 +109,18 @@
}
- public void writeMarkupScriptBody(FacesContext context, UIComponent component, boolean children) throws IOException {
+ public void writeMarkupScriptBody(FacesContext context,
+ UIComponent component, boolean children) throws IOException {
ResponseWriter responseWriter = context.getResponseWriter();
- responseWriter.write("function (context) { return this.invoke('getContent', context).join('')");
+ responseWriter
+ .write("function (context) { return this.invoke('getContent', context).join('')");
responseWriter.write("}.bind(");
writeScriptBody(context, component, children);
responseWriter.write(")");
}
-
- public void writePreloadBody(FacesContext context, UICalendar calendar) throws IOException {
+
+ public void writePreloadBody(FacesContext context, UICalendar calendar)
+ throws IOException {
Object preload = calendar.getPreload();
if (preload != null) {
ResponseWriter writer = context.getResponseWriter();
@@ -111,19 +128,21 @@
}
}
- public void writeSubmitFunction(FacesContext context, UICalendar calendar) throws IOException {
+ public void writeSubmitFunction(FacesContext context, UICalendar calendar)
+ throws IOException {
ResponseWriter writer = context.getResponseWriter();
- String clientId = calendar.getClientId(context);
+ String clientId = calendar.getClientId(context);
- JSFunction ajaxFunction = AjaxRendererUtils.buildAjaxFunction(calendar, context,
- AjaxRendererUtils.AJAX_FUNCTION_NAME);
+ JSFunction ajaxFunction = AjaxRendererUtils.buildAjaxFunction(calendar,
+ context, AjaxRendererUtils.AJAX_FUNCTION_NAME);
ajaxFunction.addParameter(JSReference.NULL);
Map options = AjaxRendererUtils.buildEventOptions(context, calendar);
options.put("calendar", JSReference.THIS);
- //ajax single
- options.put("control", new JSReference(JSReference.THIS.toScript(), "id"));
-
+ // ajax single
+ options.put("control", new JSReference(JSReference.THIS.toScript(),
+ "id"));
+
String oncomplete = AjaxRendererUtils.getAjaxOncomplete(calendar);
JSFunctionDefinition oncompleteDefinition = new JSFunctionDefinition();
oncompleteDefinition.addParameter("request");
@@ -133,7 +152,7 @@
if (oncomplete != null) {
oncompleteDefinition.addToBody(oncomplete);
}
-
+
options.put("oncomplete", oncompleteDefinition);
Map parametersMap = (Map) options.get("parameters");
JSReference requestValue = new JSReference("requestValue");
@@ -145,7 +164,7 @@
definition.addToBody(ajaxFunction);
writer.write(definition.toScript());
}
-
+
public static Object formatDate(Date date) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
@@ -158,4 +177,3 @@
}
}
-
17 years, 6 months
JBoss Rich Faces SVN: r1607 - in trunk: cdk/generator/src/main/resources/META-INF/templates12 and 11 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-07-12 10:56:06 -0400 (Thu, 12 Jul 2007)
New Revision: 1607
Modified:
trunk/cdk/generator/src/main/resources/META-INF/templates/componentTag.vm
trunk/cdk/generator/src/main/resources/META-INF/templates12/componentTag.vm
trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java
trunk/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java
trunk/ui/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java
trunk/ui/gmap/src/test/java/org/richfaces/component/GmapComponentTest.java
trunk/ui/inputnumber-slider/src/test/java/org/richfaces/component/InputNumberSliderComponentTest.java
trunk/ui/inputnumber-spinner/src/test/java/org/richfaces/component/InputNumberSpinnerComponentTest.java
trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuSeparatorComponentTest.java
trunk/ui/modal-panel/src/test/java/org/richfaces/component/ModalPanelComponentTest.java
trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java
trunk/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java
trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java
Log:
- unit tests fixed
- elonly handling fixed for MethodBinding
Modified: trunk/cdk/generator/src/main/resources/META-INF/templates/componentTag.vm
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/templates/componentTag.vm 2007-07-12 14:51:23 UTC (rev 1606)
+++ trunk/cdk/generator/src/main/resources/META-INF/templates/componentTag.vm 2007-07-12 14:56:06 UTC (rev 1607)
@@ -94,18 +94,6 @@
setValueChangedListenerProperty(component, this._${prop.name});
#elseif($prop.name == "value")
setValueProperty(component, this._${prop.name});
- #elseif($prop.elonly || $prop.isInstanceof("javax.faces.el.ValueBinding") )
- setValueBinding(component, "${prop.name}",this._${prop.name});
- #elseif(${prop.simpleType})
- // Simple type - ${prop.simpleClassName}
- set${prop.boxingClass}Property(component, "${prop.name}",this._${prop.name});
- #elseif($prop.classname == "java.lang.Boolean" || $prop.classname == "java.lang.Integer" || $prop.classname == "java.lang.Long")
- set${prop.simpleClassName}Property(component, "${prop.name}",this._${prop.name});
- #elseif( $prop.classname == "java.lang.String")
- setStringProperty(component, "${prop.name}",this._${prop.name});
- #elseif( $prop.classname == "java.lang.Object")
- // TODO - handle object
- setStringProperty(component, "${prop.name}",this._${prop.name});
#elseif( $prop.isInstanceof("javax.faces.el.MethodBinding") )
if(null != this._${prop.name}){
if (isValueReference(this._${prop.name}))
@@ -119,6 +107,18 @@
getFacesContext().getExternalContext().log("Component " + component.getClientId(getFacesContext()) + " has invalid ${prop.name} value: " + this._${prop.name});
}
}
+ #elseif($prop.elonly || $prop.isInstanceof("javax.faces.el.ValueBinding") )
+ setValueBinding(component, "${prop.name}",this._${prop.name});
+ #elseif(${prop.simpleType})
+ // Simple type - ${prop.simpleClassName}
+ set${prop.boxingClass}Property(component, "${prop.name}",this._${prop.name});
+ #elseif($prop.classname == "java.lang.Boolean" || $prop.classname == "java.lang.Integer" || $prop.classname == "java.lang.Long")
+ set${prop.simpleClassName}Property(component, "${prop.name}",this._${prop.name});
+ #elseif( $prop.classname == "java.lang.String")
+ setStringProperty(component, "${prop.name}",this._${prop.name});
+ #elseif( $prop.classname == "java.lang.Object")
+ // TODO - handle object
+ setStringProperty(component, "${prop.name}",this._${prop.name});
#else
// TODO - setup properties for other cases.
// name ${prop.name} with type $prop.classname
Modified: trunk/cdk/generator/src/main/resources/META-INF/templates12/componentTag.vm
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/templates12/componentTag.vm 2007-07-12 14:51:23 UTC (rev 1606)
+++ trunk/cdk/generator/src/main/resources/META-INF/templates12/componentTag.vm 2007-07-12 14:56:06 UTC (rev 1607)
@@ -94,18 +94,6 @@
setValueChangedListenerProperty(component, this._${prop.name});
#elseif($prop.name == "value")
setValueProperty(component, this._${prop.name});
- #elseif($prop.elonly || $prop.isInstanceof("javax.faces.el.ValueBinding") )
- setValueBinding(component, "${prop.name}",this._${prop.name});
- #elseif(${prop.simpleType})
- // Simple type - ${prop.simpleClassName}
- set${prop.boxingClass}Property(component, "${prop.name}",this._${prop.name});
- #elseif($prop.classname == "java.lang.Boolean" || $prop.classname == "java.lang.Integer" || $prop.classname == "java.lang.Long")
- set${prop.simpleClassName}Property(component, "${prop.name}",this._${prop.name});
- #elseif( $prop.classname == "java.lang.String")
- setStringProperty(component, "${prop.name}",this._${prop.name});
- #elseif( $prop.classname == "java.lang.Object")
- // TODO - handle object
- setStringProperty(component, "${prop.name}",this._${prop.name});
#elseif( $prop.isInstanceof("javax.faces.el.MethodBinding") )
if(null != this._${prop.name}){
if (isValueReference(this._${prop.name}))
@@ -119,6 +107,18 @@
getFacesContext().getExternalContext().log("Component " + component.getClientId(getFacesContext()) + " has invalid ${prop.name} value: " + this._${prop.name});
}
}
+ #elseif($prop.elonly || $prop.isInstanceof("javax.faces.el.ValueBinding") )
+ setValueBinding(component, "${prop.name}",this._${prop.name});
+ #elseif(${prop.simpleType})
+ // Simple type - ${prop.simpleClassName}
+ set${prop.boxingClass}Property(component, "${prop.name}",this._${prop.name});
+ #elseif($prop.classname == "java.lang.Boolean" || $prop.classname == "java.lang.Integer" || $prop.classname == "java.lang.Long")
+ set${prop.simpleClassName}Property(component, "${prop.name}",this._${prop.name});
+ #elseif( $prop.classname == "java.lang.String")
+ setStringProperty(component, "${prop.name}",this._${prop.name});
+ #elseif( $prop.classname == "java.lang.Object")
+ // TODO - handle object
+ setStringProperty(component, "${prop.name}",this._${prop.name});
#else
// TODO - setup properties for other cases.
// name ${prop.name} with type $prop.classname
Modified: trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java
===================================================================
--- trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java 2007-07-12 14:51:23 UTC (rev 1606)
+++ trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java 2007-07-12 14:56:06 UTC (rev 1607)
@@ -57,7 +57,7 @@
static {
javaScripts.add("org.ajax4jsf.javascript.AjaxScript");
- javaScripts.add("org.ajax4jsf.javascript.PrototypeScriptpt");
+ javaScripts.add("org.ajax4jsf.javascript.PrototypeScript");
}
private UIDatascroller scroller;
Modified: trunk/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java
===================================================================
--- trunk/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java 2007-07-12 14:51:23 UTC (rev 1606)
+++ trunk/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java 2007-07-12 14:56:06 UTC (rev 1607)
@@ -40,7 +40,7 @@
private static Set javaScripts = new HashSet();
static {
- javaScripts.add("org.ajax4jsf.javascript.PrototypeScriptpt");
+ javaScripts.add("org.ajax4jsf.javascript.PrototypeScript");
javaScripts.add("org.ajax4jsf.javascript.AjaxScript");
javaScripts.add("scripts/browser_info.js");
javaScripts.add("org.ajax4jsf.dnd.DnDScript");
Modified: trunk/ui/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java
===================================================================
--- trunk/ui/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java 2007-07-12 14:51:23 UTC (rev 1606)
+++ trunk/ui/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java 2007-07-12 14:56:06 UTC (rev 1607)
@@ -50,7 +50,7 @@
private static Set javaScripts = new HashSet();
static {
- javaScripts.add("org.ajax4jsf.javascript.PrototypeScriptpt");
+ javaScripts.add("org.ajax4jsf.javascript.PrototypeScript");
javaScripts.add("org.ajax4jsf.javascript.AjaxScript");
javaScripts.add("org.ajax4jsf.util.command.CommandScript");
javaScripts.add("scripts/menu.js");
Modified: trunk/ui/gmap/src/test/java/org/richfaces/component/GmapComponentTest.java
===================================================================
--- trunk/ui/gmap/src/test/java/org/richfaces/component/GmapComponentTest.java 2007-07-12 14:51:23 UTC (rev 1606)
+++ trunk/ui/gmap/src/test/java/org/richfaces/component/GmapComponentTest.java 2007-07-12 14:56:06 UTC (rev 1607)
@@ -48,7 +48,7 @@
private final static String TEST_STYLE = "width:500px; height:400px";
static {
- javaScripts.add("org.ajax4jsf.javascript.PrototypeScriptpt");
+ javaScripts.add("org.ajax4jsf.javascript.PrototypeScript");
javaScripts.add("org.ajax4jsf.javascript.AjaxScript");
javaScripts.add("script/gmap.js");
javaScripts.add("http://maps.google.com");
Modified: trunk/ui/inputnumber-slider/src/test/java/org/richfaces/component/InputNumberSliderComponentTest.java
===================================================================
--- trunk/ui/inputnumber-slider/src/test/java/org/richfaces/component/InputNumberSliderComponentTest.java 2007-07-12 14:51:23 UTC (rev 1606)
+++ trunk/ui/inputnumber-slider/src/test/java/org/richfaces/component/InputNumberSliderComponentTest.java 2007-07-12 14:56:06 UTC (rev 1607)
@@ -75,7 +75,7 @@
*/
static {
- javaScripts.add("org.ajax4jsf.javascript.PrototypeScriptpt");
+ javaScripts.add("org.ajax4jsf.javascript.PrototypeScript");
javaScripts.add("org.ajax4jsf.javascript.AjaxScript");
javaScripts.add("script/SliderScript.js");
javaScripts.add("org/richfaces/renderkit/html/scripts/browser_info.js");
Modified: trunk/ui/inputnumber-spinner/src/test/java/org/richfaces/component/InputNumberSpinnerComponentTest.java
===================================================================
--- trunk/ui/inputnumber-spinner/src/test/java/org/richfaces/component/InputNumberSpinnerComponentTest.java 2007-07-12 14:51:23 UTC (rev 1606)
+++ trunk/ui/inputnumber-spinner/src/test/java/org/richfaces/component/InputNumberSpinnerComponentTest.java 2007-07-12 14:56:06 UTC (rev 1607)
@@ -68,7 +68,7 @@
private static Set javaScripts = new HashSet();
static {
- javaScripts.add("org.ajax4jsf.javascript.PrototypeScriptpt");
+ javaScripts.add("org.ajax4jsf.javascript.PrototypeScript");
javaScripts.add("org.ajax4jsf.javascript.AjaxScript");
javaScripts.add("script/SpinnerScript.js");
javaScripts.add("org/richfaces/renderkit/html/scripts/browser_info.js");
Modified: trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuSeparatorComponentTest.java
===================================================================
--- trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuSeparatorComponentTest.java 2007-07-12 14:51:23 UTC (rev 1606)
+++ trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuSeparatorComponentTest.java 2007-07-12 14:56:06 UTC (rev 1607)
@@ -41,7 +41,7 @@
static {
javaScripts.add("org.ajax4jsf.javascript.AjaxScript()");
- javaScripts.add("org.ajax4jsf.javascript.PrototypeScriptpt()");
+ javaScripts.add("org.ajax4jsf.javascript.PrototypeScript()");
javaScripts.add("org.ajax4jsf.util.command.CommandScript()");
}
*/
Modified: trunk/ui/modal-panel/src/test/java/org/richfaces/component/ModalPanelComponentTest.java
===================================================================
--- trunk/ui/modal-panel/src/test/java/org/richfaces/component/ModalPanelComponentTest.java 2007-07-12 14:51:23 UTC (rev 1606)
+++ trunk/ui/modal-panel/src/test/java/org/richfaces/component/ModalPanelComponentTest.java 2007-07-12 14:56:06 UTC (rev 1607)
@@ -56,7 +56,7 @@
static {
javaScripts.add("org.ajax4jsf.javascript.AjaxScript");
- javaScripts.add("org.ajax4jsf.javascript.PrototypeScriptpt");
+ javaScripts.add("org.ajax4jsf.javascript.PrototypeScript");
javaScripts.add("scripts/utils.js");
javaScripts.add("scripts/modalPanel.js");
javaScripts.add("scripts/modalPanelBorders.js");
Modified: trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java
===================================================================
--- trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java 2007-07-12 14:51:23 UTC (rev 1606)
+++ trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java 2007-07-12 14:56:06 UTC (rev 1607)
@@ -48,7 +48,7 @@
static {
javaScripts.add("org.ajax4jsf.javascript.AjaxScript");
- javaScripts.add("org.ajax4jsf.javascript.PrototypeScriptpt");
+ javaScripts.add("org.ajax4jsf.javascript.PrototypeScript");
javaScripts.add("org.ajax4jsf.javascript.ImageCacheScript");
javaScripts.add("org/ajax4jsf/javascript/scripts/form.js");
javaScripts.add("org/richfaces/renderkit/html/scripts/browser_info.js");
Modified: trunk/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java
===================================================================
--- trunk/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java 2007-07-12 14:51:23 UTC (rev 1606)
+++ trunk/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java 2007-07-12 14:56:06 UTC (rev 1607)
@@ -51,7 +51,7 @@
static {
javaScripts.add("org.ajax4jsf.javascript.AjaxScript");
- javaScripts.add("org.ajax4jsf.javascript.PrototypeScriptpt");
+ javaScripts.add("org.ajax4jsf.javascript.PrototypeScript");
javaScripts.add("scripts/togglePanel.js");
}
Modified: trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java
===================================================================
--- trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java 2007-07-12 14:51:23 UTC (rev 1606)
+++ trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java 2007-07-12 14:56:06 UTC (rev 1607)
@@ -73,7 +73,7 @@
static {
javaScripts.add("/org/richfaces/renderkit/html/scripts/json/json.js");
- javaScripts.add("org.ajax4jsf.javascript.PrototypeScriptpt");
+ javaScripts.add("org.ajax4jsf.javascript.PrototypeScript");
javaScripts.add("scripts/AJAX.js");
javaScripts.add("org.ajax4jsf.dnd.DnDScript");
17 years, 6 months
JBoss Rich Faces SVN: r1606 - in branches/3.0.2/richfaces/common/src: test/java/org/richfaces/component and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-07-12 10:51:23 -0400 (Thu, 12 Jul 2007)
New Revision: 1606
Modified:
branches/3.0.2/richfaces/common/src/main/java/org/richfaces/component/UIRangedNumberInput.java
branches/3.0.2/richfaces/common/src/test/java/org/richfaces/component/UIRangedNumberInputTest.java
Log:
http://jira.jboss.com/jira/browse/RF-443
Modified: branches/3.0.2/richfaces/common/src/main/java/org/richfaces/component/UIRangedNumberInput.java
===================================================================
--- branches/3.0.2/richfaces/common/src/main/java/org/richfaces/component/UIRangedNumberInput.java 2007-07-12 14:11:21 UTC (rev 1605)
+++ branches/3.0.2/richfaces/common/src/main/java/org/richfaces/component/UIRangedNumberInput.java 2007-07-12 14:51:23 UTC (rev 1606)
@@ -40,6 +40,15 @@
public abstract String getMinValue();
public abstract void setMinValue(String value);
+ public abstract boolean isDisabled();
+ public abstract void setDisabled(boolean disabled);
+
+ public void decode(FacesContext arg0) {
+ if (this.isDisabled())
+ return;
+ super.decode(arg0);
+ }
+
protected void validateValue(FacesContext context, Object newValue) {
if (isValid() && !isEmpty(newValue)) {
String label = MessageUtil.getLabel(context, this).toString();
Modified: branches/3.0.2/richfaces/common/src/test/java/org/richfaces/component/UIRangedNumberInputTest.java
===================================================================
--- branches/3.0.2/richfaces/common/src/test/java/org/richfaces/component/UIRangedNumberInputTest.java 2007-07-12 14:11:21 UTC (rev 1605)
+++ branches/3.0.2/richfaces/common/src/test/java/org/richfaces/component/UIRangedNumberInputTest.java 2007-07-12 14:51:23 UTC (rev 1606)
@@ -37,6 +37,7 @@
input = new UIRangedNumberInput() {
private String minValue;
private String maxValue;
+ private boolean disabled;
public String getMinValue() {
return minValue;
@@ -50,6 +51,12 @@
public void setMaxValue(String maxValue) {
this.maxValue = maxValue;
}
+ public boolean isDisabled() {
+ return disabled;
+ }
+ public void setDisabled(boolean disabled) {
+ this.disabled = disabled;
+ }
};
input.setMaxValue("100");
17 years, 6 months