JBoss Rich Faces SVN: r11703 - in trunk/test-applications/jsp/src/main: webapp/Editor and 5 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: adubovsky
Date: 2008-12-10 11:08:47 -0500 (Wed, 10 Dec 2008)
New Revision: 11703
Modified:
trunk/test-applications/jsp/src/main/java/togglePanel/TogglePanel.java
trunk/test-applications/jsp/src/main/webapp/Editor/Editor.jsp
trunk/test-applications/jsp/src/main/webapp/PickList/PickList.jsp
trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp
trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelProperty.jsp
trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxProperty.jsp
trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp
trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelProperty.jsp
trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarthProperty.jsp
Log:
minor changes
Modified: trunk/test-applications/jsp/src/main/java/togglePanel/TogglePanel.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/togglePanel/TogglePanel.java 2008-12-10 16:07:30 UTC (rev 11702)
+++ trunk/test-applications/jsp/src/main/java/togglePanel/TogglePanel.java 2008-12-10 16:08:47 UTC (rev 11703)
@@ -1,5 +1,8 @@
package togglePanel;
+import javax.faces.event.ActionEvent;
+import javax.faces.event.ValueChangeEvent;
+
import org.richfaces.component.html.HtmlTogglePanel;
import util.componentInfo.ComponentInfo;
@@ -10,18 +13,35 @@
private String stateOrder;
private String switchType;
private HtmlTogglePanel htmlTogglePanel = null;
+ private boolean immediate = false;
public void addHtmlTogglePanel(){
ComponentInfo info = ComponentInfo.getInstance();
info.addField(htmlTogglePanel);
}
+ public void actionListener(ActionEvent e) {
+ System.out.println("!!! actionListener work !!!");
+ }
+
+ public void valueChangeListener(ValueChangeEvent e) {
+ System.out.println("!!! ValueChangeEvent work !!!");
+ }
+
public TogglePanel() {
initialState="asus";
switchType="server";
stateOrder="asus,benq,toshiba";
}
+ public boolean isImmediate() {
+ return immediate;
+ }
+
+ public void setImmediate(boolean immediate) {
+ this.immediate = immediate;
+ }
+
public String getInitialState() {
return initialState;
}
Modified: trunk/test-applications/jsp/src/main/webapp/Editor/Editor.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Editor/Editor.jsp 2008-12-10 16:07:30 UTC (rev 11702)
+++ trunk/test-applications/jsp/src/main/webapp/Editor/Editor.jsp 2008-12-10 16:08:47 UTC (rev 11703)
@@ -10,7 +10,7 @@
value="#{editor.value}" width="#{editor.width}"
height="#{editor.height}" theme="#{editor.theme}"
onchange="#{event.onchange}" oninit="#{event.oninit}"
- onsave="#{event.onsave}" onsetup="#{event.onsetup}"
+ onsetup="#{event.onsetup}"
autoResize="#{editor.autoResize}" converter="#{editor.convert}"
converterMessage="converterMessage" immediate="#{editor.immediate}"
rendered="#{editor.rendered}" required="#{editor.required}"
Modified: trunk/test-applications/jsp/src/main/webapp/PickList/PickList.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/PickList/PickList.jsp 2008-12-10 16:07:30 UTC (rev 11702)
+++ trunk/test-applications/jsp/src/main/webapp/PickList/PickList.jsp 2008-12-10 16:08:47 UTC (rev 11703)
@@ -7,7 +7,7 @@
showButtonsLabel="#{pickList.showButtonLabels}"
valueChangeListener="#{pickList.valueChangeListener}"
controlClass="#{style.controlClass}"
- listClass="#{style.listClass}"
+ listClass="#{style.listClass}"
style="#{style.style}" styleClass="#{style.styleClass}"
copyAllControlLabel="#{pickList.copyAllControlLabel}"
copyControlLabel="#{pickList.copyControlLabel}"
@@ -24,7 +24,7 @@
required="#{pickList.required}"
requiredMessage="#{pickList.requiredMessage}"
onclick="#{event.onclick}"
- ondblclick="#{event.ondblclick}"
+ ondblclick="#{event.ondblclick}"
onkeydown="#{event.onkeydown}"
onkeypress="#{event.onkeypress}"
onkeyup="#{event.onkeyup}"
Modified: trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp 2008-12-10 16:07:30 UTC (rev 11702)
+++ trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp 2008-12-10 16:08:47 UTC (rev 11703)
@@ -1,34 +1,48 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="simpleTogglePanelSubviewID">
- <rich:simpleTogglePanel id="stpIncludeID" switchType="client">
- <f:facet name="closeMarker">
- <h:outputText value="Close it"/>
- </f:facet>
+ <rich:simpleTogglePanel id="stpIncludeID" switchType="client">
+ <f:facet name="closeMarker">
+ <h:outputText value="Close it" />
+ </f:facet>
- <f:facet name="openMarker">
- <h:outputText value="Open it"/>
- </f:facet>
- <h:selectOneMenu value="#{richBean.srcContainer}" onchange="submit();">
- <f:selectItems value="#{richBean.listContainer}"/>
- </h:selectOneMenu>
- <jsp:include flush="true" page="${richBean.pathComponentContainer}"/>
- </rich:simpleTogglePanel>
- <rich:simpleTogglePanel binding="#{simpleTogglePanel.htmlSimpleTogglePanel}" id="sTP" bodyClass="body" headerClass="head" label="simpleTogglePanel with some text" action="#{simpleTogglePanel.act}" actionListener="#{simpleTogglePanel.actListener}"
- width="#{simpleTogglePanel.width}" height="#{simpleTogglePanel.height}" switchType="#{simpleTogglePanel.switchType}"
- style="#{style.style}" styleClass="#{style.styleClass}"
- oncollapse="#{event.oncollapse}" onbeforedomupdate="#{event.onbeforedomupdate}" onexpand="#{event.onexpand}" opened="#{event.opened}" onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}">
- <f:facet name="closeMarker">
- <h:outputText value="Close It"/>
- </f:facet>
- <f:facet name="openMarker">
- <h:outputText value="Open It"/>
- </f:facet>
- <f:verbatim>
+ <f:facet name="openMarker">
+ <h:outputText value="Open it" />
+ </f:facet>
+ <h:selectOneMenu value="#{richBean.srcContainer}" onchange="submit();">
+ <f:selectItems value="#{richBean.listContainer}" />
+ </h:selectOneMenu>
+ <jsp:include flush="true" page="${richBean.pathComponentContainer}" />
+ </rich:simpleTogglePanel>
+ <rich:simpleTogglePanel
+ binding="#{simpleTogglePanel.htmlSimpleTogglePanel}" id="sTP"
+ bodyClass="body" headerClass="head"
+ label="simpleTogglePanel with some text"
+ action="#{simpleTogglePanel.act}"
+ actionListener="#{simpleTogglePanel.actListener}"
+ width="#{simpleTogglePanel.width}"
+ height="#{simpleTogglePanel.height}"
+ switchType="#{simpleTogglePanel.switchType}" style="#{style.style}"
+ styleClass="#{style.styleClass}" oncollapse="#{event.oncollapse}"
+ onbeforedomupdate="#{event.onbeforedomupdate}"
+ onexpand="#{event.onexpand}" opened="#{event.opened}"
+ onclick="#{event.onclick}" oncomplete="#{event.oncomplete}"
+ ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}"
+ onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}"
+ onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}"
+ onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}"
+ onmouseup="#{event.onmouseup}" immediate="true">
+ <f:facet name="closeMarker">
+ <h:outputText value="Close It" />
+ </f:facet>
+ <f:facet name="openMarker">
+ <h:outputText value="Open It" />
+ </f:facet>
+ <f:verbatim>
Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text...
Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text...
Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text...
@@ -36,27 +50,48 @@
Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text...
Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text...
</f:verbatim>
- <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink>
- </rich:simpleTogglePanel>
+ <h:outputLink value="http://www.jboss.com/">
+ <f:verbatim>Link</f:verbatim>
+ </h:outputLink>
+ </rich:simpleTogglePanel>
- <rich:simpleTogglePanel id="sTP1" headerClass="head" label="simpleTogglePanel wiht image" width="#{simpleTogglePanel.width}" action="#{simpleTogglePanel.act}" actionListener="#{simpleTogglePanel.actListener}"
- height="#{simpleTogglePanel.height}" rendered="#{simpleTogglePanel.rendered}" switchType="#{simpleTogglePanel.switchType}"
- opened="false" onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}">
- <h:graphicImage value="/pics/podb109_61.jpg" width="500" height="300"></h:graphicImage>
- </rich:simpleTogglePanel>
+ <rich:simpleTogglePanel id="sTP1" headerClass="head"
+ label="simpleTogglePanel wiht image"
+ width="#{simpleTogglePanel.width}" action="#{simpleTogglePanel.act}"
+ actionListener="#{simpleTogglePanel.actListener}"
+ height="#{simpleTogglePanel.height}"
+ rendered="#{simpleTogglePanel.rendered}"
+ switchType="#{simpleTogglePanel.switchType}" opened="false"
+ onclick="#{event.onclick}" oncomplete="#{event.oncomplete}"
+ ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}"
+ onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}"
+ onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}"
+ onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}"
+ onmouseup="#{event.onmouseup}">
+ <h:graphicImage value="/pics/podb109_61.jpg" width="500" height="300"></h:graphicImage>
+ </rich:simpleTogglePanel>
- <rich:simpleTogglePanel id="sTP2" label="Focus simpleTogglePanle" width="#{simpleTogglePanel.width}" ignoreDupResponses="true" action="#{simpleTogglePanel.act}" actionListener="#{simpleTogglePanel.actListener}"
- focus="#{simpleTogglePanel.focus}" onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}">
- <f:facet name="closeMarker">
- <h:graphicImage value="/pics/ajax_stoped.gif"></h:graphicImage>
- </f:facet>
- <f:facet name="openMarker">
- <h:graphicImage value="/pics/ajax_process.gif"></h:graphicImage>
- </f:facet>
- <rich:simpleTogglePanel id="INsTP">
- <h:panelGrid columns="2">
- <h:graphicImage value="/pics/podb109_61.jpg" width="250px" height="200px"></h:graphicImage>
- <f:verbatim>
+ <rich:simpleTogglePanel id="sTP2" label="Focus simpleTogglePanle"
+ width="#{simpleTogglePanel.width}" ignoreDupResponses="true"
+ action="#{simpleTogglePanel.act}"
+ actionListener="#{simpleTogglePanel.actListener}"
+ focus="#{simpleTogglePanel.focus}" onclick="#{event.onclick}"
+ oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}"
+ onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}"
+ onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}"
+ onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}"
+ onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}">
+ <f:facet name="closeMarker">
+ <h:graphicImage value="/pics/ajax_stoped.gif"></h:graphicImage>
+ </f:facet>
+ <f:facet name="openMarker">
+ <h:graphicImage value="/pics/ajax_process.gif"></h:graphicImage>
+ </f:facet>
+ <rich:simpleTogglePanel id="INsTP">
+ <h:panelGrid columns="2">
+ <h:graphicImage value="/pics/podb109_61.jpg" width="250px"
+ height="200px"></h:graphicImage>
+ <f:verbatim>
Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text...
Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text...
Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text...
@@ -64,13 +99,14 @@
Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text...
Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text...
</f:verbatim>
- </h:panelGrid>
- </rich:simpleTogglePanel>
- </rich:simpleTogglePanel>
+ </h:panelGrid>
+ </rich:simpleTogglePanel>
+ </rich:simpleTogglePanel>
<h:panelGrid id="simpleTogglePanelActionID" columns="1">
- <a4j:commandButton value="Show action" reRender="simpleTogglePanelActionID" style=" width : 95px;"></a4j:commandButton>
+ <a4j:commandButton value="Show action"
+ reRender="simpleTogglePanelActionID" style=" width : 95px;"></a4j:commandButton>
<h:outputText value="#{simpleTogglePanel.action}" />
<h:outputText value="#{simpleTogglePanel.actionListener}" />
- </h:panelGrid>
- <rich:spacer height="20px"></rich:spacer>
+ </h:panelGrid>
+ <rich:spacer height="20px"></rich:spacer>
</f:subview>
Modified: trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelProperty.jsp 2008-12-10 16:07:30 UTC (rev 11702)
+++ trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelProperty.jsp 2008-12-10 16:08:47 UTC (rev 11703)
@@ -4,7 +4,8 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="stpPropertySubviewID">
-<h:commandButton value="add test" action="#{simpleTogglePanel.addHtmlSimpleTogglePanel}"></h:commandButton>
+ <h:commandButton value="add test"
+ action="#{simpleTogglePanel.addHtmlSimpleTogglePanel}"></h:commandButton>
<h:panelGrid columns="2" border="1">
<h:outputText value="Width:">
</h:outputText>
@@ -33,6 +34,7 @@
</h:panelGrid>
<br />
<br />
+ <%--
<div style="FONT-WEIGHT: bold;">rich:findComponent</div>
<h:panelGrid columns="2">
<rich:column>
@@ -42,4 +44,5 @@
<h:outputText value="#{rich:findComponent('sTP').value}" />
</rich:column>
</h:panelGrid>
+ --%>
</f:subview>
\ No newline at end of file
Modified: trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxProperty.jsp 2008-12-10 16:07:30 UTC (rev 11702)
+++ trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxProperty.jsp 2008-12-10 16:08:47 UTC (rev 11703)
@@ -163,10 +163,12 @@
</h:panelGrid>
<br />
<br />
+ <%--
<div style="FONT-WEIGHT: bold;">rich:findComponent</div>
<h:panelGrid columns="2">
<a4j:commandLink value="getSubmitedValue" reRender="findID"></a4j:commandLink>
<h:outputText id="findID" value="#{rich:findComponent('suggestionBoxId').submitedValue}"/>
</h:panelGrid>
+ --%>
</f:subview>
\ No newline at end of file
Modified: trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp 2008-12-10 16:07:30 UTC (rev 11702)
+++ trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp 2008-12-10 16:08:47 UTC (rev 11703)
@@ -5,18 +5,26 @@
<f:subview id="togglePanelSubviewID">
- <rich:togglePanel id="panel1" binding="#{togglePanel.htmlTogglePanel}" switchType="#{togglePanel.switchType}" initialState="asus" stateOrder="asus,blank" styleClass="#{style.styleClass}" style="width:300px!important;#{style.style};"
- onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}"
- onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}"
- onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}"
- onmouseup="#{event.onmouseup}">
+ <rich:togglePanel id="panel1" binding="#{togglePanel.htmlTogglePanel}"
+ switchType="#{togglePanel.switchType}" initialState="asus"
+ stateOrder="asus,blank" styleClass="#{style.styleClass}"
+ style="width:300px!important;#{style.style};"
+ onclick="#{event.onclick}" ondblclick="#{event.ondblclick}"
+ onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}"
+ onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}"
+ onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}"
+ onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"
+ immediate="#{togglePanel.immediate}"
+ valueChangeListener="#{togglePanel.valueChangeListener}">
<f:facet name="blank">
<rich:panel>
<f:facet name="header">
<h:panelGroup>
- <rich:toggleControl id="toggleControl_blank" for="togglePanelSubviewID:panel1">
+ <rich:toggleControl id="toggleControl_blank"
+ for="togglePanelSubviewID:panel1">
<h:outputText value="Expand" style="font-weight: bold;" />
- <h:graphicImage url="/pics/collapse.gif" style="border-width: 0px;" />
+ <h:graphicImage url="/pics/collapse.gif"
+ style="border-width: 0px;" />
</rich:toggleControl>
</h:panelGroup>
</f:facet>
@@ -27,16 +35,21 @@
<rich:panel style="overflow: auto">
<f:facet name="header">
<h:panelGroup>
- <rich:toggleControl id="toggleControl_panel1" for="togglePanelSubviewID:panel1">
+ <rich:toggleControl id="toggleControl_panel1"
+ for="togglePanelSubviewID:panel1">
<h:outputText value="Collapse" style="font-weight: bold;" />
<h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" />
</rich:toggleControl>
</h:panelGroup>
</f:facet>
- <h:panelGrid columns="2" border="0" style="width: 100%;background-color: white;">
- <h:graphicImage url="/pics/asus.jpg" height="300" width="300" alt="asus.jpg" />
+ <h:panelGrid columns="2" border="0"
+ style="width: 100%;background-color: white;">
+ <h:graphicImage url="/pics/asus.jpg" height="300" width="300"
+ alt="asus.jpg" />
+ <h:inputText value="input" required="true" />
<h:panelGroup>
- <h:outputText style="font: 18px;font-weight: bold;" value="Asus F 3 Tc" />
+ <h:outputText style="font: 18px;font-weight: bold;"
+ value="Asus F 3 Tc" />
<f:verbatim>
Processor: AMD Turion 64 X 2 - 1600 Mhz<br />
RAM: 1024 Mb<br />
@@ -45,7 +58,9 @@
Video: NVIDIA GeForce Go 7300<br />
Drive: DVD- RW DL<br />
</f:verbatim>
- <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink>
+ <h:outputLink value="http://www.jboss.com/">
+ <f:verbatim>Link</f:verbatim>
+ </h:outputLink>
</h:panelGroup>
</h:panelGrid>
</rich:panel>
@@ -57,26 +72,35 @@
<br />
</f:verbatim>
- <rich:togglePanel id="panel2" switchType="#{togglePanel.switchType}" initialState="#{togglePanel.initialState}"
- stateOrder="#{togglePanel.stateOrder}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}"
- onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}"
- onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}"
- onmouseup="#{event.onmouseup}">
+ <rich:togglePanel id="panel2" switchType="#{togglePanel.switchType}"
+ initialState="#{togglePanel.initialState}"
+ stateOrder="#{togglePanel.stateOrder}" onclick="#{event.onclick}"
+ ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}"
+ onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}"
+ onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}"
+ onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}"
+ onmouseup="#{event.onmouseup}" immediate="#{togglePanel.immediate}">
<f:facet name="asus">
<rich:panel>
<f:facet name="header">
<h:panelGroup>
- <h:outputText value="Customizable toggle panel" style="font-weight: bold;" />
- <rich:toggleControl id="toggleControl_panel_1" for="togglePanelSubviewID:panel2">
+ <h:outputText value="Customizable toggle panel"
+ style="font-weight: bold;" />
+ <rich:toggleControl id="toggleControl_panel_1"
+ for="togglePanelSubviewID:panel2">
<h:outputText value="Next"></h:outputText>
<h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" />
</rich:toggleControl>
</h:panelGroup>
</f:facet>
- <h:panelGrid columns="2" border="0" style="width: 100%;background-color: white;">
- <h:graphicImage url="/pics/asus.jpg" height="300" width="300" alt="asus.jpg" />
+ <h:panelGrid columns="2" border="0"
+ style="width: 100%;background-color: white;">
+ <h:graphicImage url="/pics/asus.jpg" height="300" width="300"
+ alt="asus.jpg" />
+ <h:inputText value="input" required="true" />
<h:panelGroup>
- <h:outputText style="font: 18px;font-weight: bold;" value="Asus F 3 Tc" />
+ <h:outputText style="font: 18px;font-weight: bold;"
+ value="Asus F 3 Tc" />
<f:verbatim>
Processor: AMD Turion 64 X 2 - 1600 Mhz<br />
RAM: 1024 Mb<br />
@@ -94,17 +118,22 @@
<rich:panel>
<f:facet name="header">
<h:panelGroup>
- <h:outputText value="Customizable toggle panel" style="font-weight: bold;" />
- <rich:toggleControl id="toggleControl_panel_2" for="togglePanelSubviewID:panel2">
+ <h:outputText value="Customizable toggle panel"
+ style="font-weight: bold;" />
+ <rich:toggleControl id="toggleControl_panel_2"
+ for="togglePanelSubviewID:panel2">
<h:outputText value="Next"></h:outputText>
<h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" />
</rich:toggleControl>
</h:panelGroup>
</f:facet>
- <h:panelGrid columns="2" border="0" style="width: 100%;background-color: yellow;">
- <h:graphicImage url="/pics/benq.jpg" height="300" width="300" alt="benq.jpg" />
+ <h:panelGrid columns="2" border="0"
+ style="width: 100%;background-color: yellow;">
+ <h:graphicImage url="/pics/benq.jpg" height="300" width="300"
+ alt="benq.jpg" />
<h:panelGroup>
- <h:outputText style="font: 18px;font-weight: bold;" value="BenQ A 52" />
+ <h:outputText style="font: 18px;font-weight: bold;"
+ value="BenQ A 52" />
<f:verbatim>
Processor: Core Duo T2250 (1.73GHz)<br />
RAM: 1024 Mb<br />
@@ -122,17 +151,22 @@
<rich:panel>
<f:facet name="header">
<h:panelGroup>
- <h:outputText value="Customizable toggle panel" style="font-weight: bold;" />
- <rich:toggleControl id="toggleControl_panel_3" for="togglePanelSubviewID:panel2">
+ <h:outputText value="Customizable toggle panel"
+ style="font-weight: bold;" />
+ <rich:toggleControl id="toggleControl_panel_3"
+ for="togglePanelSubviewID:panel2">
<h:outputText value="Next"></h:outputText>
<h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" />
</rich:toggleControl>
</h:panelGroup>
</f:facet>
- <h:panelGrid columns="2" border="0" style="width: 100%;background-color: orange;">
- <h:graphicImage url="/pics/toshiba.jpg" height="300" width="300" alt="toshiba.jpg" />
+ <h:panelGrid columns="2" border="0"
+ style="width: 100%;background-color: orange;">
+ <h:graphicImage url="/pics/toshiba.jpg" height="300" width="300"
+ alt="toshiba.jpg" />
<h:panelGroup>
- <h:outputText style="font: 18px;font-weight: bold;" value="Toshiba Satellite A 100-784" />
+ <h:outputText style="font: 18px;font-weight: bold;"
+ value="Toshiba Satellite A 100-784" />
<f:verbatim>
Processor: Intel Core Duo T2250 - 1.73GHz<br />
RAM: 1024 Mb<br />
Modified: trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelProperty.jsp 2008-12-10 16:07:30 UTC (rev 11702)
+++ trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelProperty.jsp 2008-12-10 16:08:47 UTC (rev 11703)
@@ -30,9 +30,13 @@
<f:selectItem itemLabel="ajax" itemValue="ajax" />
<a4j:support event="onclick" reRender="panel1,panel2"></a4j:support>
</h:selectOneRadio>
+
+ <h:outputText value="immediate:"></h:outputText>
+ <h:selectBooleanCheckbox value="#{togglePanel.immediate}" onchange="submit();"/>
</h:panelGrid>
<br />
<br />
+ <%--
<div style="FONT-WEIGHT: bold;">rich:findComponent</div>
<h:panelGrid columns="2">
<rich:column>
@@ -42,4 +46,5 @@
<h:outputText value="#{rich:findComponent('panel2').stateOrder}" />
</rich:column>
</h:panelGrid>
+ --%>
</f:subview>
\ No newline at end of file
Modified: trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarthProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarthProperty.jsp 2008-12-10 16:07:30 UTC (rev 11702)
+++ trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarthProperty.jsp 2008-12-10 16:08:47 UTC (rev 11703)
@@ -67,6 +67,7 @@
<br />
<h:commandButton value="add test" action="#{virtualEarth.addHtmlVirtualEarth}"></h:commandButton>
<br />
+ <%--
<div style="FONT-WEIGHT: bold;">rich:findComponent</div>
<h:panelGrid columns="2">
<rich:column>
@@ -76,4 +77,5 @@
<h:outputText value="#{rich:findComponent('vEarthID').rendererType}" />
</rich:column>
</h:panelGrid>
+ --%>
</f:subview>
\ No newline at end of file
16 years, 1 month
JBoss Rich Faces SVN: r11702 - trunk/test-applications/seamApp/web/src/main/webapp/Editor.
by richfaces-svn-commits＠lists.jboss.org
Author: adubovsky
Date: 2008-12-10 11:07:30 -0500 (Wed, 10 Dec 2008)
New Revision: 11702
Modified:
trunk/test-applications/seamApp/web/src/main/webapp/Editor/Editor.xhtml
Log:
delete onsave attribute of editor
Modified: trunk/test-applications/seamApp/web/src/main/webapp/Editor/Editor.xhtml
===================================================================
--- trunk/test-applications/seamApp/web/src/main/webapp/Editor/Editor.xhtml 2008-12-10 16:02:56 UTC (rev 11701)
+++ trunk/test-applications/seamApp/web/src/main/webapp/Editor/Editor.xhtml 2008-12-10 16:07:30 UTC (rev 11702)
@@ -2,7 +2,8 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:a4j="http://richfaces.org/a4j"
xmlns:h="http://java.sun.com/jsf/html"
- xmlns:rich="http://richfaces.org/rich" id="editorSubviewID">
+ xmlns:rich="http://richfaces.org/rich"
+ xmlns:s="http://jboss.com/products/seam/taglib" id="editorSubviewID">
<h:panelGrid id="EditorPanelID" columns="2" border="1">
@@ -10,7 +11,7 @@
value="#{editor.value}" width="#{editor.width}"
height="#{editor.height}" theme="#{editor.theme}"
onchange="#{event.onchange}" oninit="#{event.oninit}"
- onsave="#{event.onsave}" onsetup="#{event.onsetup}"
+ onsetup="#{event.onsetup}"
autoResize="#{editor.autoResize}" immediate="#{editor.immediate}"
rendered="#{editor.rendered}" required="#{editor.required}"
requiredMessage="requiredMessage" useSeamText="#{editor.useSeamText}"
16 years, 1 month
JBoss Rich Faces SVN: r11701 - in trunk/test-applications/seleniumTest/richfaces/src: main/webapp/pages/calendar and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-12-10 11:02:56 -0500 (Wed, 10 Dec 2008)
New Revision: 11701
Added:
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/calendar/calendarAutoTest.xhtml
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/autotest/bean/AutoTestBean.java
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/template/autotest/dataTable.xhtml
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/template/autotest/modalPanel.xhtml
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/template/autotest/simple.xhtml
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java
Log:
RF-5231
Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/autotest/bean/AutoTestBean.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/autotest/bean/AutoTestBean.java 2008-12-10 16:00:00 UTC (rev 11700)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/autotest/bean/AutoTestBean.java 2008-12-10 16:02:56 UTC (rev 11701)
@@ -48,6 +48,8 @@
public static final String VALIDATOR_DEFAULT_ID = "autoTestDefaultValidator";
public static final String ONCOMPLETE = "window._ajaxOncomplete = true;";
+
+ public static final String VALIDATOR_MESSAGE = "Validator message";
// private String input = INPUT_TEXT;
@@ -68,7 +70,7 @@
private String oncomplete = ONCOMPLETE;
private String validatorId = VALIDATOR_DEFAULT_ID;
-
+
public void actionListener(ActionEvent event) {
setStatus(getStatus() + ACTION_LISTENER_STATUS);
}
@@ -331,4 +333,12 @@
this.validatorId = validatorId;
}
+ /**
+ * @return the validatorMessage
+ */
+ public String getValidatorMessage() {
+ return VALIDATOR_MESSAGE;
+ }
+
+
}
Added: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/calendar/calendarAutoTest.xhtml
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/calendar/calendarAutoTest.xhtml (rev 0)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/calendar/calendarAutoTest.xhtml 2008-12-10 16:02:56 UTC (rev 11701)
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+
+<ui:composition template="#{templateBean.autoTestTemplate}">
+ <ui:define name="component">
+ <rich:calendar id="componentId"
+ immediate="#{autoTestBean.immediate}"
+ ajaxSingle="#{autoTestBean.ajaxSingle}"
+ reRender="#{autoTestBean.reRender}"
+ limitToList="#{autoTestBean.limitToList}"
+ bypassUpdates="#{autoTestBean.bypassUpdate}"
+ rendered="#{autoTestBean.rendered}"
+ oncomplete="#{autoTestBean.oncomplete}"
+ validatorMessage="#{autoTestBean.validatorMessage}"
+ mode="ajax"
+ popup="false"
+ >
+ <f:validator validatorId="#{autoTestBean.validatorId}" />
+ <f:param name="parameter1" value="value1" />
+ </rich:calendar>
+ </ui:define>
+</ui:composition>
+</html>
\ No newline at end of file
Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/template/autotest/dataTable.xhtml
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/webapp/template/autotest/dataTable.xhtml 2008-12-10 16:00:00 UTC (rev 11700)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/template/autotest/dataTable.xhtml 2008-12-10 16:02:56 UTC (rev 11701)
@@ -17,6 +17,8 @@
<h:form id="autoTestForm">
<ui:include src="../../layout/autotest/autoTestHiddens.xhtml" />
<ui:insert name="component" />
+ <br/>
+ <h:message id="_auto_messageId" for="componentId"></h:message>
</h:form>
</h:panelGroup>
<h:outputText value="#{row}" rendered="#{templateBean.dataTableRowIndex != row}" />
Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/template/autotest/modalPanel.xhtml
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/webapp/template/autotest/modalPanel.xhtml 2008-12-10 16:00:00 UTC (rev 11700)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/template/autotest/modalPanel.xhtml 2008-12-10 16:02:56 UTC (rev 11701)
@@ -19,6 +19,8 @@
<h:form id="autoTestForm">
<ui:include src="../../layout/autotest/autoTestHiddens.xhtml" />
<ui:insert name="component" />
+ <br/>
+ <h:message id="_auto_messageId" for="componentId"></h:message>
</h:form>
<ui:include src="../../layout/controlLayout.xhtml" />
</rich:modalPanel>
Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/template/autotest/simple.xhtml
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/webapp/template/autotest/simple.xhtml 2008-12-10 16:00:00 UTC (rev 11700)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/template/autotest/simple.xhtml 2008-12-10 16:02:56 UTC (rev 11701)
@@ -11,6 +11,8 @@
<h:form id="autoTestForm">
<ui:include src="../../layout/autotest/autoTestHiddens.xhtml" />
<ui:insert name="component" />
+ <br/>
+ <h:message id="_auto_messageId" for="componentId"></h:message>
</h:form>
</ui:define>
</ui:composition>
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java 2008-12-10 16:00:00 UTC (rev 11700)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java 2008-12-10 16:02:56 UTC (rev 11701)
@@ -31,6 +31,8 @@
public static final String STATUS_ID = "_auto_status";
private static final String TIME_ID = "_auto_time";
+
+ private static final String MESSAGE_FOR_ID = "_auto_messageId";
public static final String COMPONENT_ID = "componentId";
@@ -41,6 +43,8 @@
private static final String AJAX_SUBMIT = "_auto_ajax_submit";
private static final String AJAX_RESET = "_auto_ajax_reset";
+
+ private
// /private String componentName;
@@ -377,6 +381,18 @@
private void changeValue() {
base.changeValue();
}
+
+ private void setInternalValidation(boolean passed) {
+ setupControl(TestSetupEntry.validatorId, (passed) ? AutoTestBean.VALIDATOR_DEFAULT_ID : AutoTestBean.VALIDATOR_ID);
+ }
+
+ private String getValidatorMessage() {
+ String id = base.getParentId() + AUTOTEST_FORM_ID + MESSAGE_FOR_ID;
+ if (base.isPresent(id)) {
+ return base.getTextById(base.getParentId() + AUTOTEST_FORM_ID + MESSAGE_FOR_ID);
+ }
+ return "";
+ }
public void setupControl(TestSetupEntry attr, Object o) {
final String idPrefix = "_auto_";
@@ -387,6 +403,35 @@
base.runScript("document.getElementById('" + controlId + "').checked = " + o.toString());
}
}
+
+ public void testValidatorAndValidatorMessageAttributes() {
+ setInternalValidation(true);
+ clickLoad();
+ renderPage(base.getTemplate(), null);
+
+ changeValue();
+ clickSubmit();
+
+ String validatorMessage = getValidatorMessage();
+ if (!"".equals(validatorMessage)) {
+ Assert.fail("Validator attribute does not work. Validation failed, but should not.");
+ }
+
+ setInternalValidation(false);
+ clickLoad();
+ renderPage(base.getTemplate(), null);
+
+ changeValue();
+ clickSubmit();
+
+ validatorMessage = getValidatorMessage();
+ if ("".equals(validatorMessage)) {
+ Assert.fail("Validator attribute does not work. Validation passed, should be failed.");
+ }else if (!AutoTestBean.VALIDATOR_MESSAGE.equals(validatorMessage)) {
+ Assert.fail("ValidatorMessage attribute does not work. ValidationMessage expected: [" + AutoTestBean.VALIDATOR_MESSAGE+"].But was [" + validatorMessage + "]");
+ }
+
+ }
public void checkActionListener(boolean passed) {
String status = getStatus();
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java 2008-12-10 16:00:00 UTC (rev 11700)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java 2008-12-10 16:02:56 UTC (rev 11701)
@@ -30,6 +30,7 @@
import org.ajax4jsf.bean.CalendarTestBean;
import org.ajax4jsf.template.Template;
import org.ajax4jsf.util.DateUtils;
+import org.richfaces.AutoTester;
import org.richfaces.SeleniumTestBase;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -265,7 +266,16 @@
}
}
+
@Test
+ public void testValidatorAndValidatorMessageAttributes(Template template) {
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(template, RESET_METHOD);
+ calendarId = tester.getClientId(AutoTester.COMPONENT_ID, template);
+ tester.testValidatorAndValidatorMessageAttributes();
+ }
+
+ @Test
public void testClientMode(Template template) {
renderPage(template, RESET_METHOD);
initIds(getParentId());
@@ -406,7 +416,7 @@
}
- //@Test
+ @Test
public void testCalendarComponent(Template template) {
renderPage(template);
@@ -435,7 +445,7 @@
Assert.assertTrue(isVisibleById(calendarOpenedId), "Calendar window should be visible on the component!");
}
- // @Test
+ @Test
public void testSelectDateComponent(Template template) {
renderPage(template);
@@ -527,7 +537,7 @@
Assert.assertEquals(currentDate, month_year, "Calendar shows wrong current date");
}
- @Test
+ @Test
public void testValueAndCurrentDateOfCalendarWithPopupFalse(Template template) {
renderPage(template, RESET_METHOD);
initIds(getParentId());
@@ -890,4 +900,14 @@
public String getTestUrl() {
return "pages/calendar/calendarTest.xhtml";
}
+
+ @Override
+ public String getAutoTestUrl() {
+ return "pages/calendar/calendarAutoTest.xhtml";
+ }
+
+ @Override
+ public void changeValue() {
+ changeDate();
+ }
}
16 years, 1 month
JBoss Rich Faces SVN: r11700 - trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2008-12-10 11:00:00 -0500 (Wed, 10 Dec 2008)
New Revision: 11700
Modified:
trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java
Log:
Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java
===================================================================
--- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java 2008-12-10 15:57:40 UTC (rev 11699)
+++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java 2008-12-10 16:00:00 UTC (rev 11700)
@@ -26,6 +26,9 @@
* @see org.richfaces.realworld.service.IAlbumAction#addAlbum()
*/
public void addAlbum(Album album) {
+ if(album.getChangedName() != album.getName()){
+ album.setName(album.getChangedName());
+ }
em.persist(album);
user.addAlbum(album);
em.flush();
16 years, 1 month
JBoss Rich Faces SVN: r11699 - trunk/ui/dataFilterSlider/src/main/templates.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-12-10 10:57:40 -0500 (Wed, 10 Dec 2008)
New Revision: 11699
Modified:
trunk/ui/dataFilterSlider/src/main/templates/dataFilterSlider.jspx
Log:
https://jira.jboss.org/jira/browse/RF-4874
Modified: trunk/ui/dataFilterSlider/src/main/templates/dataFilterSlider.jspx
===================================================================
--- trunk/ui/dataFilterSlider/src/main/templates/dataFilterSlider.jspx 2008-12-10 15:55:25 UTC (rev 11698)
+++ trunk/ui/dataFilterSlider/src/main/templates/dataFilterSlider.jspx 2008-12-10 15:57:40 UTC (rev 11699)
@@ -21,7 +21,7 @@
<![CDATA[org.richfaces.component.util.FormUtil.throwEnclFormReqExceptionIfNeed(context,component);]]>
</jsp:scriptlet>
- <div class="slider-container rich-dataFilterSlider-container #{component.styleClass}">
+ <div class="slider-container rich-dataFilterSlider-container #{component.styleClass}" style="#{component.attributes['style']}">
<div id="#{clientId}slider-range" class="range rich-dataFilterSlider-range #{component.rangeStyleClass}" style="width:#{component.attributes['width']}">
<div id="#{clientId}slider-range-decor" class="range-decor rich-dataFilterSlider-range-decor">
<jsp:scriptlet>
16 years, 1 month
JBoss Rich Faces SVN: r11698 - trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2008-12-10 10:55:25 -0500 (Wed, 10 Dec 2008)
New Revision: 11698
Modified:
trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates/albumModalPanel.xhtml
Log:
Modified: trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates/albumModalPanel.xhtml
===================================================================
(Binary files differ)
16 years, 1 month
JBoss Rich Faces SVN: r11697 - in trunk/test-applications/realworld/web/src/main: webapp and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2008-12-10 10:45:01 -0500 (Wed, 10 Dec 2008)
New Revision: 11697
Modified:
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeSelectionManager.java
trunk/test-applications/realworld/web/src/main/webapp/imagePreview.xhtml
trunk/test-applications/realworld/web/src/main/webapp/layout/menu.xhtml
trunk/test-applications/realworld/web/src/main/webapp/search.xhtml
Log:
Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeSelectionManager.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeSelectionManager.java 2008-12-10 15:33:41 UTC (rev 11696)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeSelectionManager.java 2008-12-10 15:45:01 UTC (rev 11697)
@@ -265,7 +265,9 @@
private void setDataScrollerIndex(int index) {
UIComponent component = FacesContext.getCurrentInstance().getViewRoot();
UIDatascroller scroller = (UIDatascroller)component.findComponent("mainform:sc1");
- scroller.setPage(index+1);
+ //scroller.setPage(index+1);
+ Map<String, Object> attributes = scroller.getDataTable().getAttributes();
+ attributes.put(UIDatascroller.SCROLLER_STATE_ATTRIBUTE, index+1);
selectedImageIndex.setSelectedImageIndex(index+1);
}
@@ -277,7 +279,9 @@
selectedImage = selectedAlbum.getImages().get(index +1);
UIComponent component = FacesContext.getCurrentInstance().getViewRoot();
UIDatascroller scroller = (UIDatascroller)component.findComponent("mainform:sc1");
- scroller.setPage(index+2);
+ //scroller.setPage(index+2);
+ Map<String, Object> attributes = scroller.getDataTable().getAttributes();
+ attributes.put(UIDatascroller.SCROLLER_STATE_ATTRIBUTE, index+2);
selectedImageIndex.setSelectedImageIndex(index+2);
}
Modified: trunk/test-applications/realworld/web/src/main/webapp/imagePreview.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld/web/src/main/webapp/layout/menu.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld/web/src/main/webapp/search.xhtml
===================================================================
(Binary files differ)
16 years, 1 month
JBoss Rich Faces SVN: r11696 - trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-12-10 10:33:41 -0500 (Wed, 10 Dec 2008)
New Revision: 11696
Modified:
trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java
Log:
RF-5245
Modified: trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java
===================================================================
--- trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java 2008-12-10 15:12:55 UTC (rev 11695)
+++ trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java 2008-12-10 15:33:41 UTC (rev 11696)
@@ -371,6 +371,10 @@
}
}
+ private boolean isDefOptionValue(Object value) {
+ return value != null ? "".equals(((String)value).trim()) : true;
+ }
+
/**
* Gets script.
*
@@ -397,8 +401,17 @@
String option = OPTIONS[i];
Object value = attributes.get(option);
+ if(option.equals("entryClass") && isDefOptionValue(value)) {
+ value = "richfaces_suggestionEntry";
+ }
+
+ if(option.equals("selectValueClass") && isDefOptionValue(value)) {
+ value = "richfaces_suggestionSelectValue";
+ }
+
if (null != value) {
if (!"frequency".equals(option) || ((Double) value).doubleValue() > 1E-9) {
+
options.put(option, value);
}
}
@@ -429,7 +442,11 @@
}
if (component.getValueBinding("fetchValue") != null
|| attributes.get("fetchValue") != null) {
- options.put("select", attributes.get("selectValueClass"));
+ Object select = attributes.get("selectValueClass");
+ if (isDefOptionValue(select)) {
+ select = "richfaces_suggestionSelectValue";
+ }
+ options.put("select", select);
}
UISuggestionBox suggestionBox = (UISuggestionBox) component;
@@ -890,8 +907,10 @@
public final String getEntryClass(final FacesContext context,
final UIComponent component) {
String entryClass = (String) component.getAttributes().get("entryClass");
- if (null == entryClass)
- entryClass = "";
+ if (isDefOptionValue(entryClass)) {
+ entryClass = "richfaces_suggestionEntry";
+ }
+
String rowClass = (String) component.getAttributes().get("rowClasses");
if (null == rowClass)
rowClass = "";
16 years, 1 month
JBoss Rich Faces SVN: r11695 - trunk/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2008-12-10 10:12:55 -0500 (Wed, 10 Dec 2008)
New Revision: 11695
Modified:
trunk/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js
Log:
https://jira.jboss.org/jira/browse/RF-4459
Modified: trunk/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js
===================================================================
--- trunk/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js 2008-12-10 14:20:41 UTC (rev 11694)
+++ trunk/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js 2008-12-10 15:12:55 UTC (rev 11695)
@@ -238,7 +238,11 @@
if (e.srcElement)
this.hintParentElement = e.srcElement;
-
+ if (this.hidingTimerHandle)
+ {
+ window.clearTimeout(this.hidingTimerHandle);
+ this.hidingTimerHandle = undefined;
+ }
if(this.mode == 'ajax'){
if(this.toolTipDefaultContent){
this.toolTipContent.innerHTML = this.toolTipDefaultContent.innerHTML;
@@ -267,11 +271,6 @@
eval(this.ajaxExecuteString);
} else {
this.setToolTipPosition(e);
- if (this.hidingTimerHandle)
- {
- window.clearTimeout(this.hidingTimerHandle);
- this.hidingTimerHandle = undefined;
- }
if (this.delay>0)
{
this.activationTimerHandle = window.setTimeout(function()
@@ -345,6 +344,11 @@
this.hidingTimerHandle = window.setTimeout(function()
{
this.hideDiv(event);
+ if (this.hidingTimerHandle)
+ {
+ window.clearTimeout(this.hidingTimerHandle);
+ this.hidingTimerHandle = undefined;
+ }
}.bindAsEventListener(this), this.hideDelay);
}
else this.hideDiv();
16 years, 1 month
JBoss Rich Faces SVN: r11694 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2008-12-10 09:20:41 -0500 (Wed, 10 Dec 2008)
New Revision: 11694
Modified:
trunk/docs/userguide/en/src/main/docbook/included/editor.xml
Log:
https://jira.jboss.org/jira/browse/RF-5042
added some selectors to the guide
Modified: trunk/docs/userguide/en/src/main/docbook/included/editor.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/editor.xml 2008-12-10 14:19:54 UTC (rev 11693)
+++ trunk/docs/userguide/en/src/main/docbook/included/editor.xml 2008-12-10 14:20:41 UTC (rev 11694)
@@ -1186,8 +1186,16 @@
<entry>Defines styles for the menus</entry>
</row>
+ <row>
+ <entry>.richfacesSkin .mceMenu .mceMenuItemActive</entry>
+ <entry>Defines styles for the active menu items</entry>
+ </row>
+ <row>
+ <entry>.richfacesSkin .mceMenu .mceMenuItemActive</entry>
+ <entry>Defines styles for the active menu items</entry>
+ </row>
</tbody>
</tgroup>
</table>
16 years, 1 month