JBoss Rich Faces SVN: r6817 - trunk/samples/richfaces-demo/src/main/webapp/richfaces/keepAlive/examples.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2008-03-14 10:09:56 -0400 (Fri, 14 Mar 2008)
New Revision: 6817
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/keepAlive/examples/enabledIssue.xhtml
Log:
http://jira.jboss.com/jira/browse/RF-2345
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/keepAlive/examples/enabledIssue.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/keepAlive/examples/enabledIssue.xhtml 2008-03-14 14:07:41 UTC (rev 6816)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/keepAlive/examples/enabledIssue.xhtml 2008-03-14 14:09:56 UTC (rev 6817)
@@ -17,7 +17,7 @@
<h:panelGrid columns="2" width="100%" columnClasses="pcolumn">
<f:verbatim>
- This example <b>will not work</b> as expected. The expression for 'enabled' attribute
+ This example <b>will not work</b> as expected. The expression for 'disabled' attribute
equals true only after UPDATE model phase when the rsBean properties are
updated with submitted values. So, the component is rendered as enabled
on the RENDER RESPONSE phase.<br />
16 years, 10 months
JBoss Rich Faces SVN: r6816 - trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-03-14 10:07:41 -0400 (Fri, 14 Mar 2008)
New Revision: 6816
Modified:
trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css/inplaceinput.xcss
Log:
http://jira.jboss.com/jira/browse/RF-2515
Modified: trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css/inplaceinput.xcss
===================================================================
--- trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css/inplaceinput.xcss 2008-03-14 14:01:25 UTC (rev 6815)
+++ trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css/inplaceinput.xcss 2008-03-14 14:07:41 UTC (rev 6816)
@@ -38,7 +38,8 @@
margin:0px;
padding:0px 0px 0px 0px;
position: absolute;
- left: 0px;
+ top:0px;
+ left:0px;
}
.rich-inplace-input-view-hover {
16 years, 10 months
JBoss Rich Faces SVN: r6815 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2008-03-14 10:01:25 -0400 (Fri, 14 Mar 2008)
New Revision: 6815
Modified:
trunk/docs/userguide/en/src/main/docbook/included/pickList.xml
Log:
http://jira.jboss.com/jira/browse/RF-2174 - Fixing errors made by Vladimir Sukhov
Modified: trunk/docs/userguide/en/src/main/docbook/included/pickList.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/pickList.xml 2008-03-14 13:58:15 UTC (rev 6814)
+++ trunk/docs/userguide/en/src/main/docbook/included/pickList.xml 2008-03-14 14:01:25 UTC (rev 6815)
@@ -2,8 +2,8 @@
<section>
<sectioninfo>
<keywordset>
- <keyword>rich:fileUpload</keyword>
- <keyword>fileUpload</keyword>
+ <keyword>rich:pickList</keyword>
+ <keyword>pickList</keyword>
</keywordset>
</sectioninfo>
<table>
@@ -21,27 +21,27 @@
<row>
<entry>component-type</entry>
- <entry>org.richfaces.component.FileUpload</entry>
+ <entry>org.richfaces.PickList</entry>
</row>
<row>
<entry>component-class</entry>
- <entry>org.richfaces.component.html.HtmlFileUpload</entry>
+ <entry>org.richfaces.component.html.HtmlPickList</entry>
</row>
<row>
<entry>component-family</entry>
- <entry>org.richfaces.component.FileUpload</entry>
+ <entry>org.richfaces.PickList</entry>
</row>
<row>
<entry>renderer-type</entry>
- <entry>org.richfaces.renderkit.html.FileUploadRenderer</entry>
+ <entry>org.richfaces.PickListRenderer</entry>
</row>
<row>
<entry>tag-class</entry>
- <entry>org.richfaces.taglib.FileUploadTag</entry>
+ <entry>org.richfaces.taglib.PickListTag</entry>
</row>
</tbody>
</tgroup>
@@ -54,7 +54,10 @@
<emphasis role="bold">Example:</emphasis>
</para>
<programlisting role="XML"><![CDATA[...
-<rich:fileUpload uploadData="#{bean.data}"/>
+<rich:pickList value="#{pickBean.listValues}">
+ <f:selectItem itemValue="Bentley" itemLabel="Bentley"/>
+ <f:selectItem itemValue="Audi" itemLabel="Audi"/>
+</rich:pickList>
...]]></programlisting>
</section>
<section>
@@ -63,9 +66,9 @@
<para>
<emphasis role="bold">Example:</emphasis>
</para>
- <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlFileUpload;
+ <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlPickList;
...
-HtmlFileUpload myFileUpload = new HtmlFileUpload();
+HtmlPickList myPickList = new HtmlPickList();
...]]></programlisting>
</section>
<section>
@@ -330,17 +333,13 @@
<entry>generalBackgroundColor</entry>
<entry>background-color</entry>
</row>
- <row>
- <entry>tableBorderWidth</entry>
- <entry>border-width</entry>
- </row>
</tbody>
</tgroup>
</table>
<table>
- <title>Skin parameters redefinition for a button</title>
+ <title>Skin parameters redefinition for a button, button in disable state</title>
<tgroup cols="2">
<thead>
<row>
@@ -368,40 +367,10 @@
</tbody>
</tgroup>
- </table>
- <table>
- <title>Skin parameters redefinition for a disabled button</title>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>Skin parameters</entry>
- <entry>CSS properties</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>trimColor</entry>
- <entry>background-color</entry>
- </row>
- <row>
- <entry>generalTextColor</entry>
- <entry>color</entry>
- </row>
- <row>
- <entry>generalFamilyFont</entry>
- <entry>font-family</entry>
- </row>
- <row>
- <entry>generalSizeFont</entry>
- <entry>font-size</entry>
- </row>
-
- </tbody>
- </tgroup>
</table>
-
+
<table>
- <title>Skin parameters redefinition for a pressed button</title>
+ <title>Skin parameters redefinition for a pressed and highlighted button</title>
<tgroup cols="2">
<thead>
<row>
@@ -438,45 +407,8 @@
</tbody>
</tgroup>
</table>
+
<table>
- <title>Skin parameters redefinition for a highlighted button</title>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>Skin parameters</entry>
- <entry>CSS properties</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>trimColor</entry>
- <entry>background-color</entry>
- </row>
- <row>
- <entry>generalTextColor</entry>
- <entry>color</entry>
- </row>
- <row>
- <entry>generalFamilyFont</entry>
- <entry>font-family</entry>
- </row>
- <row>
- <entry>generalSizeFont</entry>
- <entry>font-size</entry>
- </row>
- <row>
- <entry>tableBorderColor</entry>
- <entry>border-color</entry>
- </row>
- <row>
- <entry>tableBorderWidth</entry>
- <entry>border-width</entry>
- </row>
-
- </tbody>
- </tgroup>
- </table>
- <table>
<title>Skin parameters redefinition for a button selection</title>
<tgroup cols="2">
<thead>
@@ -583,10 +515,18 @@
</thead>
<tbody>
<row>
- <entry>controlBorderColor</entry>
+ <entry>tableBorderColor</entry>
<entry>border-color</entry>
</row>
-
+ <row>
+ <entry>tableBottomBorderColor</entry>
+ <entry>border-bottom-color</entry>
+ </row>
+ <row>
+ <entry>tableTopBorderColor</entry>
+ <entry>border-top-color</entry>
+ </row>
+
</tbody>
</tgroup>
</table>
@@ -625,7 +565,10 @@
<entry>rich-picklist-list</entry>
<entry>Defines styles for a wrapper <table> element of a pickList</entry>
</row>
-
+ <row>
+ <entry>rich-list-picklist</entry>
+ <entry>Defines styles for a wrapper <table> element of a pickList</entry>
+ </row>
</tbody>
</tgroup>
</table>
@@ -648,7 +591,29 @@
<entry>rich-list-picklist-button-disabled</entry>
<entry>Defines styles for a disabled button</entry>
</row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <table >
+ <title>Classes names that define pressed and highlighted button representation</title>
+ <tgroup cols="2">
+ <thead>
<row>
+ <entry>Class name</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>rich-list-picklist-button</entry>
+ <entry>Defines styles for a button</entry>
+ </row>
+ <row>
+ <entry>rich-list-picklist-button-disabled</entry>
+ <entry>Defines styles for a disabled button</entry>
+ </row>
+ <row>
<entry>rich-list-picklist-button-press</entry>
<entry>Defines styles for a pressed button</entry>
</row>
@@ -656,21 +621,30 @@
<entry>rich-list-picklist-button-light</entry>
<entry>Defines styles for a button highlight</entry>
</row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <table >
+ <title>Classes names that define a button selection representation</title>
+ <tgroup cols="2">
+ <thead>
<row>
+ <entry>Class name</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
<entry>rich-list-picklist-button-selection</entry>
<entry>Defines styles for a button selection</entry>
</row>
- <row>
- <entry>rich-list-picklist-button-content</entry>
- <entry>Defines styles for a button content</entry>
- </row>
- </tbody>
+ </tbody>
</tgroup>
</table>
-
-
+
<table >
- <title>Classes names that define a source and target items representation</title>
+ <title>Classes names that define a button content representation</title>
<tgroup cols="2">
<thead>
<row>
@@ -679,21 +653,17 @@
</row>
</thead>
<tbody>
- <row>
- <entry>rich-picklist-source-items</entry>
- <entry>Defines styles for an item in a source list</entry>
+ <row>
+ <entry>rich-list-picklist-button-content</entry>
+ <entry>Defines styles for a button content</entry>
</row>
- <row>
- <entry>rich-picklist-target-items</entry>
- <entry>Defines styles for an item in a target list</entry>
- </row>
</tbody>
</tgroup>
</table>
<table >
- <title>Classes names that define a source cell representation</title>
+ <title>Classes names that define a source and target items representation</title>
<tgroup cols="2">
<thead>
<row>
@@ -703,23 +673,20 @@
</thead>
<tbody>
<row>
- <entry>rich-picklist-source-cell</entry>
- <entry>Defines styles for a cell in a source list</entry>
+ <entry>rich-picklist-source-items</entry>
+ <entry>Defines styles for an item in a source list</entry>
</row>
<row>
- <entry>rich-picklist-source-cell-selected</entry>
- <entry>Defines styles for a selected cell in a source list</entry>
+ <entry>rich-picklist-target-items</entry>
+ <entry>Defines styles for an item in a target list</entry>
</row>
- <row>
- <entry>rich-picklist-source-cell-active</entry>
- <entry>Defines styles for an active cell in a source list</entry>
- </row>
+
</tbody>
</tgroup>
</table>
<table >
- <title>Classes names that define a target cell representation</title>
+ <title>Classes names that define a source and target cell representation</title>
<tgroup cols="2">
<thead>
<row>
@@ -729,17 +696,13 @@
</thead>
<tbody>
<row>
- <entry>rich-picklist-target-cel</entry>
+ <entry>rich-picklist-source-cell</entry>
<entry>Defines styles for a cell in a source list</entry>
</row>
<row>
- <entry>rich-picklist-target-cell-selected</entry>
- <entry>Defines styles for a selected cell in a target list</entry>
+ <entry>rich-picklist-target-cell</entry>
+ <entry>Defines styles for a cell in a target list</entry>
</row>
- <row>
- <entry>rich-picklist-target-cell-active</entry>
- <entry>Defines styles for an active cell in a target list</entry>
- </row>
</tbody>
</tgroup>
</table>
16 years, 10 months
JBoss Rich Faces SVN: r6814 - in trunk/docs/userguide: en/src/main/docbook and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2008-03-14 09:58:15 -0400 (Fri, 14 Mar 2008)
New Revision: 6814
Modified:
trunk/docs/userguide/en/src/main/docbook/master.xml
trunk/docs/userguide/pom.xml
Log:
http://jira.jboss.com/jira/browse/RF-1207 - Fixing errors in pom.xml, master.xml made by Vladimir Sukhov
Modified: trunk/docs/userguide/en/src/main/docbook/master.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/master.xml 2008-03-14 13:52:15 UTC (rev 6813)
+++ trunk/docs/userguide/en/src/main/docbook/master.xml 2008-03-14 13:58:15 UTC (rev 6814)
@@ -49,9 +49,8 @@
<!ENTITY columns_table SYSTEM "../../../target/generated/columns.xml">
<!ENTITY comboBox_table SYSTEM "../../../target/generated/combobox.xml">
<!ENTITY pickList_table SYSTEM "../../../target/generated/pickList.xml">
- <!ENTITY fileUpload_table SYSTEM "../../../target/generated/fileUpload.xml">
-
-
+ <!ENTITY progressBar_table SYSTEM "../../../target/generated/progressBar.xml">
+ <!ENTITY fileUpload_table SYSTEM "../../../target/generated/fileUpload.xml">
<!ENTITY coreComponents_table SYSTEM "../../../target/generated/a4j.xml">
]>
<book>
@@ -111,7 +110,7 @@
&panelBar_table;
&panelMenu_table;
&pickList_table;
-
+&progressBar_table;
&scrollableDataTable_table;
&separator_table;
&simpleTogglePanel_table;
Modified: trunk/docs/userguide/pom.xml
===================================================================
--- trunk/docs/userguide/pom.xml 2008-03-14 13:52:15 UTC (rev 6813)
+++ trunk/docs/userguide/pom.xml 2008-03-14 13:58:15 UTC (rev 6814)
@@ -75,6 +75,7 @@
${project.version}
</version>
</artifactItem>
+
<artifactItem>
<groupId>
org.richfaces.ui
@@ -86,9 +87,8 @@
${project.version}
</version>
</artifactItem>
-
- <!--artifactItem>
+ <artifactItem>
<groupId>
org.richfaces.ui
</groupId>
@@ -98,14 +98,14 @@
<version>
${project.version}
</version>
- </artifactItem-->
+ </artifactItem>
<artifactItem>
<groupId>
org.richfaces.ui
</groupId>
<artifactId>
- comboBox
+ combobox
</artifactId>
<version>
${project.version}
@@ -711,7 +711,7 @@
<imagePathSettingRequired>
true
</imagePathSettingRequired>
- </format>
+ </format >
<format>
<formatName>html</formatName>
<stylesheetResource>
16 years, 10 months
JBoss Rich Faces SVN: r6811 - trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: vmolotkov
Date: 2008-03-14 09:30:15 -0400 (Fri, 14 Mar 2008)
New Revision: 6811
Modified:
trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
Log:
[RF-2213]combobox: the cursor blocks on the button
Modified: trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
===================================================================
--- trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-03-14 13:22:59 UTC (rev 6810)
+++ trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-03-14 13:30:15 UTC (rev 6811)
@@ -15,11 +15,15 @@
this.combobox = $(combobox);
this.comboValue = $(valueFieldId);
this.field = $(fieldId);
+ this.BUTTON_WIDTH = 17; //px
//this.field.prevValue = null;
this.button = $(buttonId);
this.buttonBG = $(buttonBGId);
+
+ this.setInputWidth();
+
// var fieldDem = Richfaces.ComboBoxList.getElemXY(this.field);
// fieldDem.height = this.field.offsetHeight;
listWidth = (!listWidth) ? this.getCurrentWidth() : listWidth;
@@ -72,6 +76,18 @@
this.comboList.listParent.observe("click", function(e){this.listClickHandler(e);}.bindAsEventListener(this));
},
+ setInputWidth : function() {
+ var width = (parseInt(this.field.parentNode.style.width) - this.BUTTON_WIDTH) + Richfaces.getBorderWidth(this.field, "r");
+ if (Prototype.Browser.Gecko) {
+ //border width and padding width not included in the general component width
+ width -= Richfaces.getPaddingWidth(this.field, "lr")
+ + Richfaces.getPaddingWidth(this.button, "lr")
+ + Richfaces.getBorderWidth(this.field, "lr")
+ + Richfaces.getBorderWidth(this.button, "lr");
+ }
+ this.field.style.width = width + "px";
+ },
+
buttonClickHandler : function(event) {
if (this.comboList.visible()) {
this.comboList.hideWithDelay();
16 years, 10 months
JBoss Rich Faces SVN: r6810 - trunk/framework/impl/src/main/javascript/ajaxjsf.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2008-03-14 09:22:59 -0400 (Fri, 14 Mar 2008)
New Revision: 6810
Modified:
trunk/framework/impl/src/main/javascript/ajaxjsf/sarissa.js
Log:
RF-2491
Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/sarissa.js
===================================================================
--- trunk/framework/impl/src/main/javascript/ajaxjsf/sarissa.js 2008-03-14 13:16:06 UTC (rev 6809)
+++ trunk/framework/impl/src/main/javascript/ajaxjsf/sarissa.js 2008-03-14 13:22:59 UTC (rev 6810)
@@ -494,10 +494,10 @@
return document.createTextNode(oNode.data);
}
else {
- var tagName = "*";
+ var tbody = false;
if(oNode.nodeName == "tbody" && oNode.parentNode){
oNode = oNode.parentNode;
- tagName = "tbody";
+ tbody = true;
}
else if(oNode.nodeName == "tbody" || oNode.nodeName == "tr"){
tmp = document.createElement("tr");
@@ -516,7 +516,11 @@
}else{
tmp.innerHTML = oNode.xml ? oNode.cloneNode(false).xml : oNode.cloneNode(false).outerHTML;
}
- return tmp.getElementsByTagName(tagName)[0];
+ if (tbody) {
+ return tmp.firstChild.tBodies[0];
+ } else {
+ return tmp.getElementsByTagName("*")[0];
+ }
}
};
}catch(e){ }
16 years, 10 months
JBoss Rich Faces SVN: r6809 - trunk/framework/test/src/main/java/org/ajax4jsf/tests.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2008-03-14 09:16:06 -0400 (Fri, 14 Mar 2008)
New Revision: 6809
Modified:
trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java
Log:
implemented expression factory for enum types
Modified: trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java
===================================================================
--- trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java 2008-03-14 13:14:03 UTC (rev 6808)
+++ trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java 2008-03-14 13:16:06 UTC (rev 6809)
@@ -27,6 +27,7 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
+import java.lang.reflect.Field;
import java.net.URL;
import java.util.Collections;
import java.util.Enumeration;
@@ -55,7 +56,7 @@
import org.ajax4jsf.tests.org.apache.shale.test.config.ConfigParser;
import org.ajax4jsf.webapp.WebXml;
import org.apache.shale.test.base.AbstractJsfTestCase;
-import org.apache.shale.test.mock.MockApplication12;
+import org.apache.shale.test.mock.MockApplication;
import org.apache.shale.test.mock.MockPrintWriter;
import org.apache.shale.test.mock.MockResponseWriter;
import org.apache.shale.test.mock.MockServletOutputStream;
@@ -111,7 +112,20 @@
// This method MUST BE OVERRIDEN in any subclasses - since Junit see for it in class for call
super.setUp();
-
+ //Try to override default expression factory with our wrapper that supports enums (like Sun's)
+ try {
+ ExpressionFactory exprFact =
+ new EnumSupportExpressionFactoryWrapper(application.getExpressionFactory());
+
+ Class<? extends MockApplication> applicationClass = application.getClass();
+ Field field = applicationClass.getDeclaredField("expressionFactory");
+ field.setAccessible(true);
+ field.set(application, exprFact);
+ expressionFactory = application.getExpressionFactory();
+ } catch(Exception e) {
+ //e.printStackTrace();
+ //We cannot set private field
+ }
/*
* Don't know yet how to support enums
*
16 years, 10 months