JBoss Rich Faces SVN: r9058 - in trunk/ui/panelbar/src: test/java/org/richfaces/component and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-06-16 11:29:14 -0400 (Mon, 16 Jun 2008)
New Revision: 9058
Modified:
trunk/ui/panelbar/src/main/templates/panelBarItem.jspx
trunk/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java
Log:
http://jira.jboss.com/jira/browse/RF-3584
Modified: trunk/ui/panelbar/src/main/templates/panelBarItem.jspx
===================================================================
--- trunk/ui/panelbar/src/main/templates/panelBarItem.jspx 2008-06-16 15:01:21 UTC (rev 9057)
+++ trunk/ui/panelbar/src/main/templates/panelBarItem.jspx 2008-06-16 15:29:14 UTC (rev 9058)
@@ -13,7 +13,7 @@
<c:object var="panel" value="#{component.panel}" type="javax.faces.component.UIComponent" />
- <div id="#{clientId}" class="dr-pnlbar rich-panelbar dr-pnlbar-ext #{panel.attributes['styleClass']}" style="#{panel.attributes['style']}">
+ <div id="#{clientId}" class="dr-pnlbar rich-panelbar dr-pnlbar-ext rich-panelbar-exterior #{panel.attributes['styleClass']}" style="#{panel.attributes['style']}">
<div class="dr-pnlbar-h rich-panelbar-header #{panel.attributes['headerClass']} #{component.attributes['headerClass']}"
style="#{panel.attributes['headerStyle']};#{component.attributes['headerStyle']}">
<jsp:scriptlet><![CDATA[
Modified: trunk/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java
===================================================================
--- trunk/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java 2008-06-16 15:01:21 UTC (rev 9057)
+++ trunk/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java 2008-06-16 15:29:14 UTC (rev 9058)
@@ -22,7 +22,6 @@
package org.richfaces.component;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -34,14 +33,12 @@
import org.ajax4jsf.event.EventsQueue;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
import org.ajax4jsf.tests.MockViewRoot;
-import org.apache.commons.lang.StringUtils;
import org.richfaces.component.html.HtmlPanelBar;
import org.richfaces.component.html.HtmlPanelBarItem;
import org.richfaces.event.SwitchablePanelSwitchEvent;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlScript;
/**
* Unit test for PanelBar components.
@@ -189,7 +186,7 @@
assertNotNull(div);
assertEquals("div", div.getNodeName());
classAttr = div.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-pnlbar rich-panelbar dr-pnlbar-ext"));
+ assertTrue(classAttr.contains("dr-pnlbar rich-panelbar dr-pnlbar-ext rich-panelbar-exterior"));
assertTrue(classAttr.contains("panelBarStyleClass"));
classAttr = div.getAttributeValue("style");
assertTrue(classAttr.contains("panelBarHeaderStyle"));
16 years
JBoss Rich Faces SVN: r9057 - trunk/ui/dataTable/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-06-16 11:01:21 -0400 (Mon, 16 Jun 2008)
New Revision: 9057
Modified:
trunk/ui/dataTable/src/main/config/component/dataList.xml
Log:
http://jira.jboss.com/jira/browse/RF-3690
http://jira.jboss.com/jira/browse/RF-3689
Modified: trunk/ui/dataTable/src/main/config/component/dataList.xml
===================================================================
--- trunk/ui/dataTable/src/main/config/component/dataList.xml 2008-06-16 13:47:49 UTC (rev 9056)
+++ trunk/ui/dataTable/src/main/config/component/dataList.xml 2008-06-16 15:01:21 UTC (rev 9057)
@@ -175,6 +175,12 @@
<classname>org.ajax4jsf.model.DataComponentState</classname>
<description>It defines EL-binding for a component state for saving or redefinition</description>
</property>
+
+ <property hidden="true">
+ <name>columnClasses</name>
+ <classname>java.lang.String</classname>
+ </property>
+
<!--
<property>
<name>param</name>
16 years
JBoss Rich Faces SVN: r9056 - trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-06-16 09:47:49 -0400 (Mon, 16 Jun 2008)
New Revision: 9056
Modified:
trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js
Log:
http://jira.jboss.com/jira/browse/RF-3516
Modified: trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js
===================================================================
--- trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js 2008-06-16 13:29:48 UTC (rev 9055)
+++ trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js 2008-06-16 13:47:49 UTC (rev 9056)
@@ -273,53 +273,57 @@
},
cancel : function(e, value) {
- this.endEditableState();
- if (!value) {
- value = this.valueKeeper.value;
- }
- this.tempValueKeeper.value = value;
- this.currentText = value;
- if ( this.tempValueKeeper.value == "") {
- this.setDefaultText();
+ if (this.invokeEvent(this.events.onviewactivation, this.inplaceInput, "rich:onviewactivation", {oldValue : this.valueKeeper.value, value : this.tempValueKeeper.value})) {
+ this.endEditableState();
+ if (!value) {
+ value = this.valueKeeper.value;
+ }
+ this.tempValueKeeper.value = value;
+ this.currentText = value;
+ if ( this.tempValueKeeper.value == "") {
+ this.setDefaultText();
+ }
+ switch (this.prevState) {
+ case Richfaces.InplaceInput.STATES[0] :
+ this.startViewState();
+ break;
+ case Richfaces.InplaceInput.STATES[2] :
+ this.startChangedState();
+ break;
+ }
+
+ if (this.events.onviewactivated) {
+ this.inplaceInput.fire("rich:onviewactivated", {oldValue : this.valueKeeper.value, value : this.tempValueKeeper.value});
+ }
}
- switch (this.prevState) {
- case Richfaces.InplaceInput.STATES[0] :
- this.startViewState();
- break;
- case Richfaces.InplaceInput.STATES[2] :
- this.startChangedState();
- break;
- }
},
save : function() {
- var userValue = this.tempValueKeeper.value;
- var currentText = userValue;
- this.saveValue(userValue);
+ if (this.invokeEvent(this.events.onviewactivation, this.inplaceInput, "rich:onviewactivation", {oldValue : this.valueKeeper.value, value : this.tempValueKeeper.value})) {
+ var userValue = this.tempValueKeeper.value;
+ this.saveValue(userValue);
+ if (this.events.onviewactivated) {
+ this.inplaceInput.fire("rich:onviewactivated", {oldValue : this.valueKeeper.value, value : this.tempValueKeeper.value});
+ }
+ }
},
saveValue : function(userValue) {
var value = this.valueKeeper.value;
- if (this.invokeEvent(this.events.onviewactivation, this.inplaceInput, "rich:onviewactivation", {oldValue : this.valueKeeper.value, value : this.tempValueKeeper.value})) {
- this.endEditableState();
+ this.endEditableState();
- if (userValue == "") {
- this.setDefaultText();
- this.valueKeeper.value = "";
- } else {
- this.currentText = userValue;
- this.valueKeeper.value = userValue;
- }
+ if (userValue == "") {
+ this.setDefaultText();
+ this.valueKeeper.value = "";
+ } else {
+ this.currentText = userValue;
+ this.valueKeeper.value = userValue;
+ }
- if (userValue != this.value) {
- this.startChangedState();
- } else {
- this.startViewState();
- }
-
- if (this.events.onviewactivated) {
- this.inplaceInput.fire("rich:onviewactivated", {oldValue : this.valueKeeper.value, value : this.tempValueKeeper.value});
- }
+ if (userValue != this.value) {
+ this.startChangedState();
+ } else {
+ this.startViewState();
}
},
16 years
JBoss Rich Faces SVN: r9055 - management/design/inplaceSelect.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2008-06-16 09:29:48 -0400 (Mon, 16 Jun 2008)
New Revision: 9055
Removed:
management/design/inplaceSelect/~$ncSpec - InplaceSelect.doc
Modified:
management/design/inplaceSelect/FuncSpec - InplaceSelect.doc
Log:
Modified: management/design/inplaceSelect/FuncSpec - InplaceSelect.doc
===================================================================
(Binary files differ)
Deleted: management/design/inplaceSelect/~$ncSpec - InplaceSelect.doc
===================================================================
(Binary files differ)
16 years
JBoss Rich Faces SVN: r9054 - trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-06-16 09:09:55 -0400 (Mon, 16 Jun 2008)
New Revision: 9054
Modified:
trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js
Log:
http://jira.jboss.com/jira/browse/RF-3256
Modified: trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js
===================================================================
--- trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js 2008-06-16 13:09:17 UTC (rev 9053)
+++ trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js 2008-06-16 13:09:55 UTC (rev 9054)
@@ -46,8 +46,8 @@
}
},
- startEditableState : function($super, textSize) {
- $super(textSize);
+ startEditableState : function($super) {
+ $super();
this.button.show();
if (this.attributes.openOnEdit) {
this.comboList.showWithDelay();
@@ -180,6 +180,34 @@
}
},
+ saveValue : function(userValue, currentText) {
+ var value = this.valueKeeper.value;
+ if (this.invokeEvent(this.events.onviewactivation, this.inplaceInput, "rich:onviewactivation", {oldValue : this.valueKeeper.value, value : this.tempValueKeeper.value})) {
+ this.endEditableState();
+ if (userValue == "") {
+ this.setDefaultText();
+ this.valueKeeper.value = "";
+ //this.startViewState();
+ } else {
+ if (currentText == "") {
+ this.setDefaultText();
+ } else {
+ this.currentText = currentText;
+ }
+ this.valueKeeper.value = userValue;
+ }
+ if (userValue != this.value) {
+ this.startChangedState();
+ } else {
+ this.startViewState();
+ }
+
+ if (this.events.onviewactivated) {
+ this.inplaceInput.fire("rich:onviewactivated", {oldValue : this.valueKeeper.value, value : this.tempValueKeeper.value});
+ }
+ }
+ },
+
applyTmpValue : function() {
if (this.comboList.activeItem) {
var userLabel = this.comboList.activeItem.innerHTML.unescapeHTML();
16 years
JBoss Rich Faces SVN: r9053 - trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-06-16 09:09:17 -0400 (Mon, 16 Jun 2008)
New Revision: 9053
Modified:
trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js
Log:
http://jira.jboss.com/jira/browse/RF-3257
Modified: trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js
===================================================================
--- trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js 2008-06-16 13:01:13 UTC (rev 9052)
+++ trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js 2008-06-16 13:09:17 UTC (rev 9053)
@@ -124,21 +124,19 @@
return;
}
}
-
-//DONT TUCH THIZ CODE
-
- if (this.invokeEvent(this.events.oneditactivation, this.inplaceInput, "rich:oneditactivation", {oldValue : this.valueKeeper.value, value : this.tempValueKeeper.value})) {
- var textSize = this.inplaceInput.offsetWidth;
-
- this.startEditableState(textSize);
-
- if (this.events.oneditactivated) {
- this.inplaceInput.fire("rich:oneditactivated", {oldValue : this.valueKeeper.value, value : this.tempValueKeeper.value});
- }
- }
+ this.edit();
}
},
+ edit: function (){
+ if (this.invokeEvent(this.events.oneditactivation, this.inplaceInput, "rich:oneditactivation", {oldValue : this.valueKeeper.value, value : this.tempValueKeeper.value})) {
+ this.startEditableState();
+ if (this.events.oneditactivated) {
+ this.inplaceInput.fire("rich:oneditactivated", {oldValue : this.valueKeeper.value, value : this.tempValueKeeper.value});
+ }
+ }
+ },
+
tmpValueBlurHandler : function() {
if (this.clickOnBar || this.byTab) {
this.clickOnBar = false;
@@ -201,11 +199,11 @@
this.deleteViewArtifacts();
},*/
- startEditableState : function(textSize) {
+ startEditableState : function() {
this.inplaceInput.style.position = "relative";
-
this.changeState(Richfaces.InplaceInput.STATES[1]);
- var inputSize = this.setInputWidth(textSize);
+ var textWidth= this.inplaceInput.offsetWidth;
+ var inputSize = this.setInputWidth(textWidth);
this.tabber.hide();
@@ -248,7 +246,7 @@
*/
//TODO: rename parameter to textWidth?
- setInputWidth : function(textSize) {
+ setInputWidth : function(textWidth) {
//TODO: use constants here
if (this.currentState != 1) {
return;
@@ -257,12 +255,12 @@
if (!width) {
var max = parseInt(this.attributes.maxInputWidth);
var min = parseInt(this.attributes.minInputWidth);
- if (textSize > max) {
+ if (textWidth > max) {
width = max;
- } else if (textSize < min) {
+ } else if (textWidth < min) {
width = min;
} else {
- width = textSize;
+ width = textWidth;
}
}
this.tempValueKeeper.style.width = width + "px";
@@ -297,55 +295,38 @@
save : function() {
var userValue = this.tempValueKeeper.value;
var currentText = userValue;
- this.saveValue(userValue, currentText);
+ this.saveValue(userValue);
},
- saveValue : function(userValue, currentText) {
+ saveValue : function(userValue) {
var value = this.valueKeeper.value;
if (this.invokeEvent(this.events.onviewactivation, this.inplaceInput, "rich:onviewactivation", {oldValue : this.valueKeeper.value, value : this.tempValueKeeper.value})) {
this.endEditableState();
+
if (userValue == "") {
this.setDefaultText();
this.valueKeeper.value = "";
- //this.startViewState();
} else {
- if (currentText == "") {
- this.setDefaultText();
- } else {
- this.currentText = currentText;
- }
+ this.currentText = userValue;
this.valueKeeper.value = userValue;
}
+
if (userValue != this.value) {
this.startChangedState();
} else {
this.startViewState();
}
- /*if (userValue != this.value) {
- if (userValue == "") {
- this.setDefaultText();
- this.valueKeeper.value = "";
- //this.startViewState();
- } else {
- this.currentText = userValue;
- this.valueKeeper.value = userValue;
- }
- this.startChangedState();
- } else {
- if (userValue == "") {
- this.setDefaultText();
- this.valueKeeper.value = "";
- } else {
- this.currentText = userValue;
- this.valueKeeper.value = userValue;
- }
- this.startViewState();
- } */
+
if (this.events.onviewactivated) {
this.inplaceInput.fire("rich:onviewactivated", {oldValue : this.valueKeeper.value, value : this.tempValueKeeper.value});
}
}
},
+
+ getValue : function() {
+ return this.valueKeeper.value;
+ },
+
//TODO: remove Bucks
//TODO: to shared library
invokeEvent : function(eventFunc, element, eventName, memo) {
16 years
JBoss Rich Faces SVN: r9052 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: atsebro
Date: 2008-06-16 09:01:13 -0400 (Mon, 16 Jun 2008)
New Revision: 9052
Modified:
trunk/docs/userguide/en/src/main/docbook/included/separator.xml
Log:
RF-3361--Separator line type
Modified: trunk/docs/userguide/en/src/main/docbook/included/separator.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/separator.xml 2008-06-16 12:22:15 UTC (rev 9051)
+++ trunk/docs/userguide/en/src/main/docbook/included/separator.xml 2008-06-16 13:01:13 UTC (rev 9052)
@@ -50,7 +50,7 @@
<emphasis role="bold">Example:</emphasis>
</para>
<programlisting role="XML"><![CDATA[...
- <rich:separator/>
+<rich:separator/>
...
]]></programlisting>
</section>
@@ -68,18 +68,14 @@
</section>
<section>
<title>Details of Usage</title>
- <para><emphasis role="bold">
- <property><rich:separator></property>
- </emphasis> is a simple layout component which represents a <property>separator</property>
- stylized as a skin. Thus, the main attributes that define its style are <emphasis>
- <property>"style"</property>
- </emphasis> and <emphasis>
- <property>"styleClass".</property>
- </emphasis> In addition there are <emphasis>
- <property>width</property>
- </emphasis> and <emphasis>
- <property>height</property>
- </emphasis> attributes that should be specified in pixels.</para>
+ <para><emphasis role="bold"><property><rich:separator></property></emphasis> is a simple layout component ,
+ which represents a <property>separator</property> stylized as a skin.
+ Thus, the main attributes that define its style are <emphasis> <property>"style"</property>
+ </emphasis> and <emphasis><property>"styleClass".</property>
+ </emphasis> In addition there are <emphasis><property>width</property></emphasis> and <emphasis><property>height</property>
+ </emphasis> attributes that should be specified in pixels.
+ On the HTML page the component is transposed into HTML <div> tag.</para>
+
<para>The line type can be customized with the <emphasis>
<property>"lineType"</property>
</emphasis> parameter. For example, different line types are shown after rendering with the
16 years
JBoss Rich Faces SVN: r9051 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2008-06-16 08:22:15 -0400 (Mon, 16 Jun 2008)
New Revision: 9051
Modified:
trunk/docs/userguide/en/src/main/docbook/included/keepAlive.xml
Log:
http://jira.jboss.com/jira/browse/RF-3701 - Description was checked. Info about 'ajaxOnly' attribute was added
Modified: trunk/docs/userguide/en/src/main/docbook/included/keepAlive.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/keepAlive.xml 2008-06-16 12:17:06 UTC (rev 9050)
+++ trunk/docs/userguide/en/src/main/docbook/included/keepAlive.xml 2008-06-16 12:22:15 UTC (rev 9051)
@@ -59,32 +59,39 @@
<section>
<title>Key attributes and ways of usage</title>
<para>
- If a managed bean is declared with <property>request</property> scope in the configuration file with the help of <property>managed-bean-scope</property> tag then the life-time of
+ If a managed bean is declared with <property>request</property> scope in the configuration file with the help of
+ <emphasis role="bold"><property><managed-bean-scope></property></emphasis> tag then the life-time of
this bean instance is valid only for the current request.
Any attempts to make a reference to the bean instance after the request end will throw in Illegal Argument Exception by the server.
- To avoid these kinds of Exception, component
- <emphasis role="bold"><property><a4j:keepAlive></property>
- </emphasis> is used to maintain the state of the whole bean object among subsequent request.
+ To avoid these kinds of Exception, component <emphasis role="bold"><property><a4j:keepAlive></property></emphasis>
+ is used to maintain the state of the whole bean object among subsequent request.
</para>
- <para><emphasis role="bold">Example:</emphasis></para>
+ <para>
+ <emphasis role="bold">Example:</emphasis>
+ </para>
<programlisting role="XML"><![CDATA[<a4j:keepAlive beanName = "#{myClass.testBean}"/>]]></programlisting>
<para>
- Note that the attribute <emphasis><property>"beanName"</property></emphasis> must point to a legal jsf EL expression which resolves to a managed mean instance. For example for
- the above code the class definition may look like this:</para>
-
+ The <emphasis><property>"beanName"</property></emphasis> attribute defines the request scope bean name you'd like
+ to re-use. Note that this attribute must point to a legal JSF EL expression which resolves to a managed mean instance. For example for
+ the above code the class definition may look like this one:
+ </para>
<programlisting role="JAVA"><![CDATA[
- class MyClass{
+class MyClass{
...
private TestBean testBean;
// Getters and Setters for testBean.
...
}
- ]]></programlisting>
-
-
+]]></programlisting>
+ <para>
+ The <emphasis><property>"ajaxOnly"</property></emphasis> attribute
+ declares whether the value of the bean should be available during a non-Ajax request.
+ If the value of this attribute is "true" a request scope bean keeps the same value during Ajax requests
+ from the given page. If a non-Ajax request is sent from this page the bean is re-created as a regular request scope bean.
+ </para>
</section>
<section>
<title>Relevant resources links</title>
16 years
JBoss Rich Faces SVN: r9050 - trunk/test-applications.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2008-06-16 08:17:06 -0400 (Mon, 16 Jun 2008)
New Revision: 9050
Modified:
trunk/test-applications/pom.xml
Log:
add servlet-api
Modified: trunk/test-applications/pom.xml
===================================================================
--- trunk/test-applications/pom.xml 2008-06-16 11:31:40 UTC (rev 9049)
+++ trunk/test-applications/pom.xml 2008-06-16 12:17:06 UTC (rev 9050)
@@ -91,6 +91,11 @@
<groupId>org.richfaces.framework</groupId>
<version>${rfVersion}</version>
</dependency>
+ <dependency>
+ <artifactId>servlet-api</artifactId>
+ <groupId>javax.servlet</groupId>
+ <version>2.5</version>
+ </dependency>
</dependencies>
<profiles>
16 years
JBoss Rich Faces SVN: r9049 - trunk/ui/combobox/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-06-16 07:31:40 -0400 (Mon, 16 Jun 2008)
New Revision: 9049
Modified:
trunk/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java
Log:
'Array' in upper case
Modified: trunk/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java
===================================================================
--- trunk/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java 2008-06-16 11:30:30 UTC (rev 9048)
+++ trunk/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java 2008-06-16 11:31:40 UTC (rev 9049)
@@ -105,7 +105,7 @@
encodeSuggestion(writer, component, value, RICH_COMBOBOX_ITEM_CLASSES);
}
} else {
- throw new IllegalArgumentException("suggestionValues should be Collection or array");
+ throw new IllegalArgumentException("suggestionValues should be Collection or Array");
}
}
return values;
16 years