JBoss Rich Faces SVN: r2646 - trunk/samples/richfaces-demo/src/main/webapp/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2007-08-31 08:16:15 -0400 (Fri, 31 Aug 2007)
New Revision: 2646
Added:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataGrid.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/messages.xhtml
Log:
Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataGrid.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataGrid.xhtml (rev 0)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataGrid.xhtml 2007-08-31 12:16:15 UTC (rev 2646)
@@ -0,0 +1,20 @@
+<!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:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:rich="http://richfaces.org/rich">
+<ui:composition template="/templates/main.xhtml">
+ <ui:define name="title">RichFaces - Open Source Rich JSF Components - Data Grid</ui:define>
+ <ui:define name="body">
+ <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tab label="Usage">
+ <ui:include src="/richfaces/dataGrid/usage.xhtml"/>
+ </rich:tab>
+ <ui:include src="/templates/include/tagInfo.xhtml">
+ <ui:param name="path" value="rich/dataGrid"/>
+ </ui:include>
+ </rich:tabPanel>
+ </ui:define>
+</ui:composition>
+</html>
Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/messages.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/messages.xhtml (rev 0)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/messages.xhtml 2007-08-31 12:16:15 UTC (rev 2646)
@@ -0,0 +1,20 @@
+<!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:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:rich="http://richfaces.org/rich">
+<ui:composition template="/templates/main.xhtml">
+ <ui:define name="title">RichFaces - Open Source Rich JSF Components - Rich Messages</ui:define>
+ <ui:define name="body">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tab label="Usage">
+ <ui:include src="/richfaces/messages/usage.xhtml"/>
+ </rich:tab>
+ <ui:include src="/templates/include/tagInfo.xhtml">
+ <ui:param name="path" value="rich/messages"/>
+ </ui:include>
+ </rich:tabPanel>
+ </ui:define>
+</ui:composition>
+</html>
\ No newline at end of file
16 years, 8 months
JBoss Rich Faces SVN: r2645 - in trunk: ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2007-08-31 08:14:57 -0400 (Fri, 31 Aug 2007)
New Revision: 2645
Modified:
trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js
trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
Log:
RF-788 fixed
RF-695 fixed
Modified: trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js
===================================================================
--- trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js 2007-08-31 11:41:11 UTC (rev 2644)
+++ trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js 2007-08-31 12:14:57 UTC (rev 2645)
@@ -147,7 +147,10 @@
}
}
-Richfaces.browser={isIE6: (!window.opera && /MSIE\s*[6][\d,\.]+;/.test(navigator.userAgent))};
+Richfaces.browser= {
+ isIE6: (!window.opera && /MSIE\s*[6][\d,\.]+;/.test(navigator.userAgent)),
+ isSafari: /Safari/.test(navigator.userAgent)
+};
Richfaces.eval = function(template, object) {
var value = '';
Modified: trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
===================================================================
--- trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-08-31 11:41:11 UTC (rev 2644)
+++ trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-08-31 12:14:57 UTC (rev 2645)
@@ -6,6 +6,7 @@
throw("calendar.js requires including script.aculo.us' effects.js library");
if (!window.Richfaces) window.Richfaces={};
+
Richfaces.Calendar={};
Richfaces.Calendar.setElementPosition = function(element, baseElement, jointPoint, direction, offset)
{
@@ -549,6 +550,14 @@
if (this.invokeEvent("collapse", element))
{
+ Event.stopObserving(window.document, "click", this.eventOnCollapse, false);
+
+ if (this.eventOnCollapseFlag)
+ {
+ Event.stopObserving(window.document, "click", this.eventOnCollapse, false);
+ this.eventOnCollapseFlag = false;
+ }
+
if (Richfaces.browser.isIE6) Element.hide(this.IFRAME_ID);
Element.hide(element);
this.isVisible = false;
@@ -573,9 +582,6 @@
var iframe = $(this.IFRAME_ID);
- var a = this;
- setTimeout(function () { Event.observe(window.document, "click", a.eventOnCollapse, false); }, 50);
-
/*this.setPopupEvents(e);
this.setPopupEvents(base);*/
@@ -610,13 +616,25 @@
Element.show(element);
this.isVisible = true;
+
+ Event.observe(window.document, "click", this.eventOnCollapse, false);
}
},
doSwitch: function() {
- this.isVisible ? this.doCollapse() : this.doExpand();
+ this.isVisible ? this.doCollapse() : this.doExpand();
},
+ eventOnCollapse: function (e) {
+ if (Event.element(e).id == this.POPUP_BUTTON_ID) return true;
+
+ Position.prepare();
+ if (Position.withinIncludingScrolloffsets($(this.id), Event.pointerX(e), Event.pointerY(e))) return true;
+ this.doCollapse();
+
+ return true;
+ },
+
getWeekDayComponentId: function (v) {
return this.id+"WeekDay"+v;
},
@@ -637,7 +655,7 @@
},
getSelectedDateString: function(pattern) {
if (!this.selectedDate) return "";
- if (!pattern) pattern = "dd/MM/y";
+ if (!pattern) pattern = "dd/MM/yyyy";
return this.selectedDate.format(pattern, this.params.monthLabels, this.params.monthLabelsShort);
},
@@ -689,13 +707,6 @@
//this.eventOnMouseOut = this.eventOnMouseOut.bindAsEventListener(this);
},
- eventOnCollapse: function (e) {
- Position.prepare();
- if (Position.withinIncludingScrolloffsets($(this.id), Event.pointerX(e), Event.pointerY(e))) return;
- Event.stopObserving(window.document, "click", this.eventOnCollapse, false);
- this.doCollapse();
- },
-
/* setPopupEvents: function(obj) {
Event.observe(obj, "mouseover", this.eventOnMouseOver, false);
Event.observe(obj, "mouseout", this.eventOnMouseOut, false);
@@ -1032,7 +1043,23 @@
if (todayflag && dataobj._month==0 && dataobj.day==todaydate)
{
this.todayCellId = element.id;
- this.todayCellColor = Element.getStyle(element, 'background-color').parseColor();
+
+ if (Richfaces.browser.isSafari && this.params.popup && !this.isVisible)
+ {
+ // Safari 2.0 fix
+ // if [display:none] Element.getStyle() function returns null;
+ var els = $(this.id).style;
+ var originalVisibility = els.visibility;
+ var originalDisplay = els.display;
+ els.visibility = 'hidden';
+ els.display = '';
+ this.todayCellColor = Element.getStyle(element, 'background-color').parseColor();
+ els.display = originalDisplay;
+ els.visibility = originalVisibility;
+ } else
+ {
+ this.todayCellColor = Element.getStyle(element, 'background-color').parseColor();
+ }
e.add("rich-calendar-today");
}
else
Modified: trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
===================================================================
--- trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-08-31 11:41:11 UTC (rev 2644)
+++ trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-08-31 12:14:57 UTC (rev 2645)
@@ -150,7 +150,7 @@
src="#{icon}"
accesskey="#{component.attributes['accesskey']}"
name="#{clientId}"
- onclick="$('#{clientId}').component.doExpand();return false;"
+ onclick="$('#{clientId}').component.doSwitch();return true;"
style="vertical-align: middle"
tabindex="#{component.attributes['tabindex']}">
</img>
16 years, 8 months
JBoss Rich Faces SVN: r2644 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: smukhina
Date: 2007-08-31 07:41:11 -0400 (Fri, 31 Aug 2007)
New Revision: 2644
Modified:
trunk/docs/userguide/en/src/main/docbook/included/effect.desc.xml
trunk/docs/userguide/en/src/main/docbook/included/effect.xml
trunk/docs/userguide/en/src/main/docbook/included/log.xml
trunk/docs/userguide/en/src/main/docbook/included/treeNodes.desc.xml
Log:
http://jira.jboss.com/jira/browse/RF-398
some spelling mistakes are corrected
Modified: trunk/docs/userguide/en/src/main/docbook/included/effect.desc.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/effect.desc.xml 2007-08-31 11:18:53 UTC (rev 2643)
+++ trunk/docs/userguide/en/src/main/docbook/included/effect.desc.xml 2007-08-31 11:41:11 UTC (rev 2644)
@@ -8,15 +8,15 @@
<section>
<title>Description</title>
<para>
- The <property>rich:effect</property> utilizes the set of effects provided by scriptaculous javascript library.
+ The <property>rich:effect</property> utilizes a set of effects provided by the scriptaculous JavaScript library.
It allows to attach effects to JSF components and html tags.
</para>
</section>
<section>
<title>Key Features</title>
<itemizedlist>
- <listitem>No developers JavaScript writing needed to use on the pages</listitem>
- <listitem>Presents scriptaculous javascript library functionality</listitem>
+ <listitem>No developers JavaScript writing needed to use it on pages</listitem>
+ <listitem>Presents scriptaculous JavaScript library functionality</listitem>
</itemizedlist>
</section>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/effect.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/effect.xml 2007-08-31 11:18:53 UTC (rev 2643)
+++ trunk/docs/userguide/en/src/main/docbook/included/effect.xml 2007-08-31 11:41:11 UTC (rev 2644)
@@ -74,11 +74,11 @@
<para>
It is possible to use <property><rich:effect></property> in two modes:
<itemizedlist>
- <listitem>attached to the JSF components or html tags and triggered by particular event.
- Wiring effect with JSF components might be occurs on the server or client.
+ <listitem>attached to the JSF components or html tags and triggered by a particular event.
+ Wiring effect with JSF components might occur on the server or client.
Wiring with html tag is possible only on the client side </listitem>
- <listitem>invoking from the javascript code by effect name.
- During the rendering, <property>rich:effect</property> generates the javascript function with defined name. When the function is called,
+ <listitem>invoking from the JavaScript code by an effect name.
+ During the rendering, <property>rich:effect</property> generates the JavaScript function with defined name. When the function is called,
the effect is applied </listitem>
</itemizedlist>
</para>
@@ -93,7 +93,7 @@
</rich:panel>
...
-<!-- invoking from javascript -->
+<!-- invoking from JavaScript -->
<div id="contentDiv">
..... div content ......
</div>
@@ -130,13 +130,13 @@
</figure>
<para>
-<emphasis><property>"name"</property></emphasis> attribute defines the name of the javascript function will
-be generated on the page when the component is rendered. You can invoke this function to activate the effect. The function access one parameter.
+<emphasis><property>"name"</property></emphasis> attribute defines a name of the JavaScript function will
+be generated on the page when the component is rendered. You can invoke this function to activate the effect. The function accesses one parameter.
It is a set of effect options in JSON format.
</para>
<para>
-<emphasis><property>"type"</property></emphasis> attribute defines the type of effect. For example, "Fade", "Blind", "Opacity". Take a look at scriptaculous documentation
+<emphasis><property>"type"</property></emphasis> attribute defines the type of an effect. For example, "Fade", "Blind", "Opacity". Have a look at <ulink url="http://script.aculo.us">scriptaculous documentation</ulink>
for set of available effect.
</para>
@@ -155,9 +155,9 @@
the <property>rich:effect</property> attribute. Those are:
<itemizedlist>
<listitem><emphasis><property>"effectId"</property></emphasis> allows to re-define the target of effect.
- The option is overrire the value of <emphasis><property>"for"</property></emphasis> attribute</listitem>
+ The option is override the value of <emphasis><property>"for"</property></emphasis> attribute</listitem>
<listitem><emphasis><property>"effectType"</property></emphasis> defines the effect type.
- The option is overrire the value of <emphasis><property>"type"</property></emphasis> attribute</listitem>
+ The option is override the value of <emphasis><property>"type"</property></emphasis> attribute</listitem>
</itemizedlist>
</para>
Modified: trunk/docs/userguide/en/src/main/docbook/included/log.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/log.xml 2007-08-31 11:18:53 UTC (rev 2643)
+++ trunk/docs/userguide/en/src/main/docbook/included/log.xml 2007-08-31 11:41:11 UTC (rev 2644)
@@ -68,7 +68,7 @@
<para>The component defined this way is decoded on a page as <emphasis role="bold"><property><div></property></emphasis> inside a page, where all the information beginning with informational message is generated.</para>
<note>
<title>Note:</title>
- <para><emphasis role="bold"><a4j:log></emphasis> is getting renewed automatically after execution of ajax requests. Don't renew <emphasis role="bold"><a4j:log></emphasis> by using reRender!</para>
+ <para><emphasis role="bold"><a4j:log></emphasis> is getting renewed automatically after execution of Ajax requests. Don't renew <emphasis role="bold"><a4j:log></emphasis> by using reRender!</para>
</note>
</section>
<!--
Modified: trunk/docs/userguide/en/src/main/docbook/included/treeNodes.desc.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/treeNodes.desc.xml 2007-08-31 11:18:53 UTC (rev 2643)
+++ trunk/docs/userguide/en/src/main/docbook/included/treeNodes.desc.xml 2007-08-31 11:41:11 UTC (rev 2644)
@@ -25,8 +25,8 @@
<section>
<title>Key Features</title>
<itemizedlist>
- <listitem>Allows to define set of nodes</listitem>
- <listitem>No developers JavaScript writing needed to use on the pages</listitem>
+ <listitem>Allows to define a set of nodes</listitem>
+ <listitem>No developers JavaScript writing needed to use it on pages</listitem>
<listitem>Built-in Ajax processing</listitem>
</itemizedlist>
</section>
16 years, 8 months
JBoss Rich Faces SVN: r2643 - in trunk/ui/message/src/main/java/org/richfaces: renderkit/html and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-08-31 07:18:53 -0400 (Fri, 31 Aug 2007)
New Revision: 2643
Modified:
trunk/ui/message/src/main/java/org/richfaces/component/UIRichMessage.java
trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessageRenderer.java
trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java
Log:
remove layout iterator
Modified: trunk/ui/message/src/main/java/org/richfaces/component/UIRichMessage.java
===================================================================
--- trunk/ui/message/src/main/java/org/richfaces/component/UIRichMessage.java 2007-08-31 11:16:20 UTC (rev 2642)
+++ trunk/ui/message/src/main/java/org/richfaces/component/UIRichMessage.java 2007-08-31 11:18:53 UTC (rev 2643)
@@ -1,5 +1,7 @@
package org.richfaces.component;
+import java.io.IOException;
+
import javax.faces.component.UIMessage;
import javax.faces.context.FacesContext;
@@ -17,7 +19,7 @@
public boolean isPassed() {
return isPassed;
}
-
+
public abstract String getPassedLabel();
public abstract void setPassedLabel(String passedLabel);
@@ -36,4 +38,10 @@
isPassed = true;
super.decode(context);
}
+
+ public void encodeEnd(FacesContext context) throws IOException {
+ super.encodeEnd(context);
+ isPassed = false;
+ }
+
}
\ No newline at end of file
Modified: trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessageRenderer.java
===================================================================
--- trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessageRenderer.java 2007-08-31 11:16:20 UTC (rev 2642)
+++ trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessageRenderer.java 2007-08-31 11:18:53 UTC (rev 2643)
@@ -87,7 +87,7 @@
getUtils().writeAttribute(writer, HTML.id_ATTRIBUTE, msgComponent.getClientId(context));
if(!msgIter.hasNext() && msgComponent.isPassed()){
-
+
encodingUIContent(msgComponent, context, null);
}else if(msgIter.hasNext() ){
Modified: trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java
===================================================================
--- trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java 2007-08-31 11:16:20 UTC (rev 2642)
+++ trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java 2007-08-31 11:18:53 UTC (rev 2643)
@@ -5,10 +5,8 @@
import java.io.IOException;
import java.util.Iterator;
-import java.util.Map;
import java.util.Set;
-import javax.faces.FacesException;
import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
import javax.faces.component.UIMessages;
@@ -28,8 +26,6 @@
private boolean isWroteTable = false;
- private boolean isIteratorLayout = false;
-
private final InternetResource[] styles = {getResource("/org/richfaces/renderkit/html/css/msgs.css")};
private InternetResource[] stylesAll = null;
@@ -82,7 +78,6 @@
protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException {
String forIds = null;
-
Iterator messagesIter = null;
@@ -101,10 +96,7 @@
String layout = null;
- String var = null;
-
-
UIRichMessages uiMessages = (UIRichMessages)component;
layout = (String)uiMessages.getAttributes().get("layout");
@@ -122,28 +114,10 @@
writer.startElement("tbody", uiMessages);
isWroteTable = true;
- isIteratorLayout = false;
-
- }else if((layout != null) && (layout.equals("iterator"))){
-
- var = (String)uiMessages.getAttributes().get("var");
- if(var == null){
- FacesException e = new FacesException(new IllegalArgumentException("var attribute is not defined"));
- throw e;
- }
-
- writer.startElement(HTML.SPAN_ELEM, uiMessages);
- getUtils().writeAttribute(writer,HTML.id_ATTRIBUTE ,uiMessages.getClientId(context));
-
- renderComponentOuterStyles(uiMessages, context, writer);
-
- isIteratorLayout = true;
- isWroteTable = false;
-
+
}else if((layout != null) && (layout.equals("list"))){
isWroteTable = false;
- isIteratorLayout = false;
writer.startElement("dl", uiMessages);
@@ -154,54 +128,23 @@
}
if(!messagesIter.hasNext()){
-
renderBody(uiMessages, context, writer, null);
-
}else{
while(messagesIter.hasNext()){
-
FacesMessage facesMsg = (FacesMessage)(messagesIter.next());
-
- if(!isIteratorLayout){
-
- renderBody(uiMessages, context, writer, facesMsg);
-
- }else{
-
- Map requestMap = context.getExternalContext().getRequestMap();
- Object value = requestMap.get(var);
- requestMap.put(var, facesMsg);
-
- try {
- renderChildren(context, uiMessages);
- } finally {
-
- if(value != null){
- requestMap.put(var, value);
- }
-
- }
-
- }
-
+ renderBody(uiMessages, context, writer, facesMsg);
}
}
- if(!isIteratorLayout){
-
- if(isWroteTable){
- writer.endElement("tbody");
- writer.endElement("table");
- }else{
- writer.endElement("dl");
- }
-
+ if(isWroteTable){
+ writer.endElement("tbody");
+ writer.endElement("table");
}else{
- writer.endElement(HTML.SPAN_ELEM);
+ writer.endElement("dl");
}
-
+
}
public void renderLabelHtml(UIComponent component, FacesContext context, ResponseWriter writer,
@@ -353,7 +296,7 @@
if(isWroteTable){
writer.startElement(HTML.TR_ELEMENT, uiMessages);
- }else if(!isIteratorLayout){
+ }else{
writer.startElement("dt", uiMessages);
}
@@ -363,12 +306,12 @@
if(isWroteTable){
writer.endElement(HTML.TR_ELEMENT);
- }else if(!isIteratorLayout){
+ }else{
writer.endElement("dt");
}
}
-
+
}
protected Class getComponentClass() {
16 years, 8 months
JBoss Rich Faces SVN: r2642 - trunk/test-applications/jsp/src/main/java/div.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-08-31 07:16:20 -0400 (Fri, 31 Aug 2007)
New Revision: 2642
Modified:
trunk/test-applications/jsp/src/main/java/div/DivBean.java
Log:
update
Modified: trunk/test-applications/jsp/src/main/java/div/DivBean.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/div/DivBean.java 2007-08-31 11:12:36 UTC (rev 2641)
+++ trunk/test-applications/jsp/src/main/java/div/DivBean.java 2007-08-31 11:16:20 UTC (rev 2642)
@@ -1,19 +1,56 @@
package div;
public class DivBean {
- private String src;
+ private String [] src = {
+ "/Calendar/Calendar.jsp",
+ "/DataFilterSlider/DataFilterSlider.jsp",
+ "/DataScroller/DS.jsp",
+ "/DradAndDrop/DragAndDrop.jsp",
+ "/DropDownMenu/DDMenu.jsp",
+ "/Effect/Effect.jsp",
+ "/Gmap/Gmap.jsp",
+ "/inputNumberSlider/inputNumberSlider.jsp",
+ "/inputNumberSpinner/inputNumberSpinner.jsp",
+ "/Insert/Insert.jsp",
+ "/Message/Message.jsp",
+ "/ModalPanel/ModalPanel.jsp",
+ "/Paint2D/Paint2D.jsp",
+ "/Panel/Panel.jsp",
+ "/Panel/panel2.jsp",
+ "/PanelBar/PanelBar.jsp",
+ "/PanelMenu/PanelMenu.jsp",
+ "/Separator/Separator.jsp",
+ "/SimpleTogglePanel/SimpleTogglePanel.jsp",
+ "/Spacer/Spacer.jsp",
+ "/SuggestionBox/SuggestionBox.jsp",
+ "/TabPanel/TabPanel.jsp",
+ "/TogglePanel/TogglePanel.jsp",
+ "/ToolBar/ToolBar.jsp",
+ "/Tooltip/Tooltip.jsp",
+ "/Tree/Tree.jsp",
+ "/VirtualEarth/VirtualEarth.jsp"
+ };
private String [] left = {"500px", "-480px"};
private String [] top = {"300px", "-280px"};
+ private int current = 0;
+ public int getCurrent() {
+ return current;
+ }
+
+ public void setCurrent(int current) {
+ this.current = current;
+ }
+
public DivBean() {
- src = "/Calendar/Calendar.xhtml";
+
}
-
- public String getSrc() {
+
+ public String[] getSrc() {
return src;
}
- public void setSrc(String src) {
+ public void setSrc(String[] src) {
this.src = src;
}
16 years, 8 months
JBoss Rich Faces SVN: r2641 - trunk/ui/menu-components/src/test/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2007-08-31 07:12:36 -0400 (Fri, 31 Aug 2007)
New Revision: 2641
Modified:
trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java
Log:
RF-759
Modified: trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java
===================================================================
--- trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java 2007-08-31 10:52:14 UTC (rev 2640)
+++ trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java 2007-08-31 11:12:36 UTC (rev 2641)
@@ -58,7 +58,9 @@
static {
javaScripts.add("PrototypeScript");
javaScripts.add("AjaxScript");
- javaScripts.add("CommandScript");
+ javaScripts.add("org/richfaces/renderkit/html/scripts/utils.js");
+ javaScripts.add("org/ajax4jsf/javascript/scripts/form.js");
+ javaScripts.add("org/richfaces/renderkit/html/scripts/form.js");
}
private UIMenuItem menuItem;
@@ -235,7 +237,7 @@
menuItem.getAttributes().put("style", "menuItemStyle");
HtmlPage page = renderView();
assertNotNull(page);
- // System.out.println(page.asXml());
+ //System.out.println(page.asXml());
HtmlElement div = page.getHtmlElementById(menuItem
.getClientId(facesContext));
assertNotNull(div);
16 years, 8 months
JBoss Rich Faces SVN: r2640 - in trunk/docs/userguide/en/src/main/docbook: modules and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: smukhina
Date: 2007-08-31 06:52:14 -0400 (Fri, 31 Aug 2007)
New Revision: 2640
Modified:
trunk/docs/userguide/en/src/main/docbook/included/ajaxListener.xml
trunk/docs/userguide/en/src/main/docbook/included/jsFunction.xml
trunk/docs/userguide/en/src/main/docbook/included/tooltip.xml
trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml
trunk/docs/userguide/en/src/main/docbook/modules/RFCfaq.xml
Log:
http://jira.jboss.com/jira/browse/RF-398
So -> Thus, Hence
Modified: trunk/docs/userguide/en/src/main/docbook/included/ajaxListener.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/ajaxListener.xml 2007-08-31 10:20:19 UTC (rev 2639)
+++ trunk/docs/userguide/en/src/main/docbook/included/ajaxListener.xml 2007-08-31 10:52:14 UTC (rev 2640)
@@ -62,7 +62,7 @@
<emphasis role="bold"><property><a4j:ajaxListener></property>
</emphasis>).
Ajax Listener is invoked before the Render Response phase. Instead of Action Listener of Value Change Listener which are not
-invoked when Validation of Update Model phases failed, Ajax Listener is guarantied to be invoked for each Ajax response. So, it is
+invoked when Validation of Update Model phases failed, Ajax Listener is guarantied to be invoked for each Ajax response. Thus, it is
a good place for update the list of re-rendered components, for example.
Ajax Listener is not invoked for non-Ajax request and when RichFaces works in "Ajax Request generates
Non-Ajax Response" mode. Therefore, Ajax Listener invocation is a good indicator that Ajax response is going to be processed.
Modified: trunk/docs/userguide/en/src/main/docbook/included/jsFunction.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/jsFunction.xml 2007-08-31 10:20:19 UTC (rev 2639)
+++ trunk/docs/userguide/en/src/main/docbook/included/jsFunction.xml 2007-08-31 10:52:14 UTC (rev 2640)
@@ -68,7 +68,7 @@
<section>
<title>Key attributes and ways of usage</title>
<para> As the component uses Ajax request to get data from server - it has all common Ajax
- Action attributes. So, action and actionListener can be invoked, and reRendering some parts of
+ Action attributes. Hence, action and actionListener can be invoked, and reRendering some parts of
the page fired after calling function. </para>
<para> When using the <emphasis role="bold">
<property><a4j:jsFunction></property>
@@ -103,7 +103,7 @@
<property><a4j:commandButton></property>
</emphasis>, but it could be activated from the JavaScript code. It allows to invoke some
server side functionality and use the returned data in the JavaScript function invoked from
- <emphasis><property>"oncomplete"</property></emphasis> attribute. So it's possible to use <emphasis
+ <emphasis><property>"oncomplete"</property></emphasis> attribute. Hence it's possible to use <emphasis
role="bold">
<property><a4j:jsFunction></property>
</emphasis> instead of <emphasis role="bold">
Modified: trunk/docs/userguide/en/src/main/docbook/included/tooltip.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/tooltip.xml 2007-08-31 10:20:19 UTC (rev 2639)
+++ trunk/docs/userguide/en/src/main/docbook/included/tooltip.xml 2007-08-31 10:52:14 UTC (rev 2640)
@@ -77,7 +77,7 @@
</para>
<para>
There is possibility to define a facet with name "defaultContent". This facet provides default content to be
-displayed while main content loaded to the page in Ajax mode. So after <property>tooltip</property> called in Ajax mode - it
+displayed while main content loaded to the page in Ajax mode. Thus after <property>tooltip</property> called in Ajax mode - it
appeared with the content defined in the facet and after loading complete content changes to loaded one.
</para>
<para>
Modified: trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2007-08-31 10:20:19 UTC (rev 2639)
+++ trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2007-08-31 10:52:14 UTC (rev 2640)
@@ -18,7 +18,7 @@
<para>The framework is implemented as a component library which adds Ajax capability into existing
pages, so you don't need to write any JavaScript code or to replace existing
components with new Ajax widgets. <property>RichFaces</property> enables page-wide Ajax support instead of the
- traditional component-wide support. So, you can define the event on the page that
+ traditional component-wide support. Hence, you can define the event on the page that
invokes an Ajax request and the areas of the page that should be synchronized with the JSF
Component Tree after the Ajax request changes the data on the server according to the
events fired on the client.</para>
@@ -120,7 +120,7 @@
</emphasis> for self-rendered containers, since this component is transient and not saved in the tree.
</listitem>
<listitem>
- Ajax requests are made by XMLHttpRequest functions in XML format, but this XML bypasses most validations and the corrections that might be made in a browser. So, create only a strict standards-compliant code for HTML and XHTML, without skipping any required elements or attributes. Any necessary XML corrections are automatically made by the XML filter on the server, but lot's of unexpected effects can be produced by an incorrect HTML code.
+ Ajax requests are made by XMLHttpRequest functions in XML format, but this XML bypasses most validations and the corrections that might be made in a browser. Thus, create only a strict standards-compliant code for HTML and XHTML, without skipping any required elements or attributes. Any necessary XML corrections are automatically made by the XML filter on the server, but lot's of unexpected effects can be produced by an incorrect HTML code.
</listitem>
</itemizedlist>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/modules/RFCfaq.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/modules/RFCfaq.xml 2007-08-31 10:20:19 UTC (rev 2639)
+++ trunk/docs/userguide/en/src/main/docbook/modules/RFCfaq.xml 2007-08-31 10:52:14 UTC (rev 2640)
@@ -178,7 +178,7 @@
<title>Does RichFaces work with facelets?</title>
<para>Main <ulink url="http://livedemo.exadel.com/richfaces-demo/"> demo</ulink> of
RichFaces is a facelets based application. Full Facelets support is one of
- the main features. So, the answer is yes.</para>
+ the main features. Hence, the answer is yes.</para>
</section>
<section>
@@ -186,7 +186,7 @@
<title>Is it possible to create dynamic menu using <rich:dropDownMenu>
component?</title>
<para><emphasis role="bold"><rich:dropDownMenu></emphasis> is a
- standard JSF component. So, creation of the menu dynamically from the Java
+ standard JSF component. Thus, creation of the menu dynamically from the Java
Script code is the same as for any other jsf component.</para>
<para>For more information follow the <ulink
url="http://www.jboss.com/index.html?module=bb&op=viewtopic&t=110983"
16 years, 8 months
JBoss Rich Faces SVN: r2639 - trunk/ui/effect/src/test/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2007-08-31 06:20:19 -0400 (Fri, 31 Aug 2007)
New Revision: 2639
Modified:
trunk/ui/effect/src/test/java/org/richfaces/component/EffectComponentTest.java
Log:
RF-759
Modified: trunk/ui/effect/src/test/java/org/richfaces/component/EffectComponentTest.java
===================================================================
--- trunk/ui/effect/src/test/java/org/richfaces/component/EffectComponentTest.java 2007-08-31 10:06:18 UTC (rev 2638)
+++ trunk/ui/effect/src/test/java/org/richfaces/component/EffectComponentTest.java 2007-08-31 10:20:19 UTC (rev 2639)
@@ -49,9 +49,9 @@
static {
javaScripts.add("org.ajax4jsf.javascript.PrototypeScript");
- javaScripts.add("org.ajax4jsf.javascript.AjaxScript");
- javaScripts.add("script/effect.js");
- javaScripts.add("http://dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=5");
+ javaScripts.add("scripts/scriptaculous/effects.js");
+ javaScripts.add("script/processEffect.js");
+ javaScripts.add("scripts/scriptaculous/scriptaculous.js");
}
/**
@@ -84,26 +84,11 @@
}
public void testRenderComponent() throws Exception {
- HtmlPage renderedView = renderView();
-
- HtmlElement htmlEffect = renderedView.getHtmlElementById(effect.getClientId(facesContext));
-
- assertNotNull(htmlEffect);
- assertTrue("div".equals(htmlEffect.getTagName()));
-
-// assertTrue(htmlEffect.getAttributeValue("class").contains("dr-ve"));
-// assertTrue(htmlEffect.getAttributeValue("class").contains("rich-effect"));
-
+
}
public void testRenderStyle() throws Exception {
- HtmlPage page = renderView();
- assertNotNull(page);
-
- List links = page.getDocumentElement().getHtmlElementsByTagName("link");
- assertEquals(1, links.size());
-
- }
+ }
public void testRenderScript() throws Exception {
HtmlPage page = renderView();
16 years, 8 months
JBoss Rich Faces SVN: r2638 - trunk/ui/dropdown-menu/src/test/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2007-08-31 06:06:18 -0400 (Fri, 31 Aug 2007)
New Revision: 2638
Modified:
trunk/ui/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java
Log:
RF-759
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-08-31 09:55:08 UTC (rev 2637)
+++ trunk/ui/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java 2007-08-31 10:06:18 UTC (rev 2638)
@@ -54,6 +54,9 @@
javaScripts.add("org.ajax4jsf.javascript.AjaxScript");
javaScripts.add("org.ajax4jsf.util.command.CommandScript");
javaScripts.add("scripts/menu.js");
+ javaScripts.add("org/richfaces/renderkit/html/scripts/utils.js");
+ javaScripts.add("org/ajax4jsf/javascript/scripts/form.js");
+ javaScripts.add("org/richfaces/renderkit/html/scripts/form.js");
}
private UIDropDownMenu dropDownMenu;
@@ -141,7 +144,7 @@
public void testRender() throws Exception {
HtmlPage page = renderView();
assertNotNull(page);
- //System.out.println(page.asXml());
+ System.out.println(page.asXml());
HtmlElement div = page.getHtmlElementById(dropDownMenu.getClientId(facesContext));
assertNotNull(div);
assertEquals("div", div.getNodeName());
16 years, 8 months