JBoss Rich Faces SVN: r8241 - trunk/ui/paint2D/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2008-04-28 11:48:02 -0400 (Mon, 28 Apr 2008)
New Revision: 8241
Modified:
trunk/ui/paint2D/src/main/config/component/paint2D.xml
Log:
http://jira.jboss.com/jira/browse/RF-730
http://jira.jboss.com/jira/browse/RF-2220
Corrected language and added default values
Modified: trunk/ui/paint2D/src/main/config/component/paint2D.xml
===================================================================
--- trunk/ui/paint2D/src/main/config/component/paint2D.xml 2008-04-28 15:47:52 UTC (rev 8240)
+++ trunk/ui/paint2D/src/main/config/component/paint2D.xml 2008-04-28 15:48:02 UTC (rev 8241)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://labs.jboss.com/jbossrichfaces/component-config.dtd
+<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://labs.jboss.com/jbossrichfaces/component-config.dtd
">
<components>
@@ -70,13 +70,13 @@
<property>
<name>width</name>
<classname>int</classname>
- <description><![CDATA[Width in pixels of image (for paint canvas and HTML attribute)]]></description>
+ <description><![CDATA[Width in pixels of image (for paint canvas and HTML attribute). Default value is "10".]]></description>
<defaultvalue>10</defaultvalue>
</property>
<property>
<name>height</name>
<classname>int</classname>
- <description><![CDATA[Height in pixels of image (for paint canvas and HTML attribute)]]></description>
+ <description><![CDATA[Height in pixels of image (for paint canvas and HTML attribute). Default value is "10".]]></description>
<defaultvalue>10</defaultvalue>
</property>
<property>
16 years, 8 months
JBoss Rich Faces SVN: r8240 - trunk/ui/orderingList/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2008-04-28 11:47:52 -0400 (Mon, 28 Apr 2008)
New Revision: 8240
Modified:
trunk/ui/orderingList/src/main/config/component/orderinglist.xml
Log:
http://jira.jboss.com/jira/browse/RF-730
http://jira.jboss.com/jira/browse/RF-2220
Corrected language and added default values
Modified: trunk/ui/orderingList/src/main/config/component/orderinglist.xml
===================================================================
--- trunk/ui/orderingList/src/main/config/component/orderinglist.xml 2008-04-28 15:47:26 UTC (rev 8239)
+++ trunk/ui/orderingList/src/main/config/component/orderinglist.xml 2008-04-28 15:47:52 UTC (rev 8240)
@@ -91,7 +91,7 @@
<name>listWidth</name>
<classname>java.lang.String</classname>
<description>
- Defines width of a list
+ Defines width of a list. Default value is "140".
</description>
<defaultvalue>"140"</defaultvalue>
</property>
@@ -99,7 +99,7 @@
<name>listHeight</name>
<classname>java.lang.String</classname>
<description>
- Defines height of a list
+ Defines height of a list. Default value is "140".
</description>
<defaultvalue>"140"</defaultvalue>
</property>
@@ -123,7 +123,7 @@
<name>controlsType</name>
<classname>java.lang.String</classname>
<description>
- Defines type of a control: button or none.
+ Defines type of a control: button or none. Default value is "button".
</description>
<defaultvalue><![CDATA["button"]]></defaultvalue>
</property>
@@ -133,7 +133,7 @@
<description>
Controls horizontal rendering. Possible values:
left - controls should be rendered to the left side of a list.
- right(Default)- controls should be rendered to the right side of a list.
+ right- controls should be rendered to the right side of a list. Default value is "right".
</description>
<defaultvalue><![CDATA["right"]]></defaultvalue>
</property>
@@ -152,7 +152,7 @@
<name>orderControlsVisible</name>
<classname>boolean</classname>
<description>
- If "false", 'Up' and 'Down' controls aren't displayed.
+ If "false", 'Up' and 'Down' controls aren't displayed. Default value is "true".
</description>
<defaultvalue>true</defaultvalue>
</property>
@@ -160,7 +160,7 @@
<name>fastOrderControlsVisible</name>
<classname>boolean</classname>
<description>
- If "false", 'Top' and 'Bottom' controls aren't displayed.
+ If "false", 'Top' and 'Bottom' controls aren't displayed. Default value is "true".
</description>
<defaultvalue>true</defaultvalue>
</property>
16 years, 8 months
JBoss Rich Faces SVN: r8239 - trunk/ui/jQuery/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2008-04-28 11:47:26 -0400 (Mon, 28 Apr 2008)
New Revision: 8239
Modified:
trunk/ui/jQuery/src/main/config/component/jQuery.xml
Log:
http://jira.jboss.com/jira/browse/RF-730
http://jira.jboss.com/jira/browse/RF-2220
Corrected language and added default values
Modified: trunk/ui/jQuery/src/main/config/component/jQuery.xml
===================================================================
--- trunk/ui/jQuery/src/main/config/component/jQuery.xml 2008-04-28 15:02:41 UTC (rev 8238)
+++ trunk/ui/jQuery/src/main/config/component/jQuery.xml 2008-04-28 15:47:26 UTC (rev 8239)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://labs.jboss.com/jbossrichfaces/component-config.dtd
+<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://labs.jboss.com/jbossrichfaces/component-config.dtd
">
<components>
@@ -63,7 +63,7 @@
"immediate" performs the query right away. "onload" adds the task to the
time when a document is loaded (the DOM tree is created). "onJScall" allows to invoke the
query by Javascipt function name defined with "name" attribute. The default value is
- "immediate".
+ "immediate".
</description>
<defaultvalue>"immediate"</defaultvalue>
</property>
16 years, 8 months
JBoss Rich Faces SVN: r8238 - trunk/samples/gmap-sample/src/main/webapp.
by richfaces-svn-commits＠lists.jboss.org
Author: vbaranov
Date: 2008-04-28 11:02:41 -0400 (Mon, 28 Apr 2008)
New Revision: 8238
Modified:
trunk/samples/gmap-sample/src/main/webapp/gmap.xhtml
Log:
Update test for http://jira.jboss.com/jira/browse/RF-1902
Modified: trunk/samples/gmap-sample/src/main/webapp/gmap.xhtml
===================================================================
--- trunk/samples/gmap-sample/src/main/webapp/gmap.xhtml 2008-04-28 15:02:17 UTC (rev 8237)
+++ trunk/samples/gmap-sample/src/main/webapp/gmap.xhtml 2008-04-28 15:02:41 UTC (rev 8238)
@@ -13,7 +13,7 @@
<h:panelGrid columns="2">
- <gmap:gmap id="gm" lat="37.97" zoom="#{bean.zoom}" gmapVar="map"
+ <gmap:gmap id="gm" lat="37.97" zoom="#{bean.zoom}" gmapVar="map" locale="DE"
gmapKey="ABQIAAAAxU6W9QEhFLMNdc3ATIu-VxT2yXp_ZAY8_ufC3CFXhHIE1NvwkxRkrpOGzxH8_ud3inE9pG1845-FCA"
style="width:500px;height:400px" />
16 years, 8 months
JBoss Rich Faces SVN: r8237 - in trunk/ui/gmap/src/main: java/org/richfaces/component and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: vbaranov
Date: 2008-04-28 11:02:17 -0400 (Mon, 28 Apr 2008)
New Revision: 8237
Modified:
trunk/ui/gmap/src/main/config/component/gmap.xml
trunk/ui/gmap/src/main/java/org/richfaces/component/UIGmap.java
trunk/ui/gmap/src/main/templates/gmap.jspx
Log:
http://jira.jboss.com/jira/browse/RF-1902
Modified: trunk/ui/gmap/src/main/config/component/gmap.xml
===================================================================
--- trunk/ui/gmap/src/main/config/component/gmap.xml 2008-04-28 14:02:27 UTC (rev 8236)
+++ trunk/ui/gmap/src/main/config/component/gmap.xml 2008-04-28 15:02:17 UTC (rev 8237)
@@ -73,6 +73,12 @@
<defaultvalue>"-122.0424842834"</defaultvalue>
</property>
<property>
+ <name>locale</name>
+ <classname>java.lang.Object</classname>
+ <description>Used for locale definition. Default value is "getDefaultLocale()".</description>
+ <defaultvalue>getDefaultLocale()</defaultvalue>
+ </property>
+ <property>
<name>zoom</name>
<classname>java.lang.String</classname>
<description>
Modified: trunk/ui/gmap/src/main/java/org/richfaces/component/UIGmap.java
===================================================================
--- trunk/ui/gmap/src/main/java/org/richfaces/component/UIGmap.java 2008-04-28 14:02:27 UTC (rev 8236)
+++ trunk/ui/gmap/src/main/java/org/richfaces/component/UIGmap.java 2008-04-28 15:02:17 UTC (rev 8237)
@@ -21,7 +21,11 @@
package org.richfaces.component;
+import java.util.Locale;
+
import javax.faces.component.UIComponentBase;
+import javax.faces.component.UIViewRoot;
+import javax.faces.context.FacesContext;
/**
* JSF component class
@@ -32,5 +36,24 @@
public static final String COMPONENT_TYPE = "org.richfaces.Gmap";
private static final String COMPONENT_FAMILY = "org.richfaces.Gmap";
-
+
+ /**
+ * Returns default <code>Locale</code>.
+ * @return default <code>Locale</code>
+ */
+ protected Locale getDefaultLocale() {
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+
+ if (facesContext != null) {
+ UIViewRoot viewRoot = facesContext.getViewRoot();
+ if (viewRoot != null) {
+ Locale locale = viewRoot.getLocale();
+ if (locale != null) {
+ return locale;
+ }
+ }
+ }
+
+ return Locale.US;
+ }
}
Modified: trunk/ui/gmap/src/main/templates/gmap.jspx
===================================================================
--- trunk/ui/gmap/src/main/templates/gmap.jspx 2008-04-28 14:02:27 UTC (rev 8236)
+++ trunk/ui/gmap/src/main/templates/gmap.jspx 2008-04-28 15:02:17 UTC (rev 8237)
@@ -10,7 +10,7 @@
component="org.richfaces.component.UIGmap">
<f:clientid var="clientId"/>
-
+ <c:set var="locale" value="#{component.attributes['locale']}"/>
<c:set var="key" value="#{component.attributes['gmapKey']}"/>
<c:set var="zoom" value="#{component.attributes['zoom']}"/>
<c:set var="map" value="#{component.attributes['gmapVar']}"/>
@@ -31,7 +31,7 @@
<div id="#{clientId}" class="dr-gmap rich-gmap #{component.attributes['styleClass']}" x:passThruWithExclusions="id,class,styleClass">
-<script type="text/javascript" src="http://maps.google.com/maps?file=api&v=2&key=#{key}" />
+<script type="text/javascript" src="http://maps.google.com/maps?file=api&v=2&key=#{key}&hl=#{locale}" />
<script type="text/javascript">
//<![CDATA[
16 years, 8 months
JBoss Rich Faces SVN: r8236 - in trunk/test-applications/seleniumTest/src: main/webapp/WEB-INF and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-04-28 10:02:27 -0400 (Mon, 28 Apr 2008)
New Revision: 8236
Added:
trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/A4JPollTestBean.java
trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxPoll/
trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxPoll/ajaxPollTest.xhtml
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/AjaxPollTest.java
Modified:
trunk/test-applications/seleniumTest/src/main/webapp/WEB-INF/faces-config.xml
trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/SeleniumTestBase.java
Log:
Ajax Poll Test
Added: trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/A4JPollTestBean.java
===================================================================
--- trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/A4JPollTestBean.java (rev 0)
+++ trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/A4JPollTestBean.java 2008-04-28 14:02:27 UTC (rev 8236)
@@ -0,0 +1,54 @@
+package org.ajax4jsf;
+
+import javax.faces.event.ActionEvent;
+
+public class A4JPollTestBean {
+
+ private Integer i = 1;
+
+ private static final String POLLING = "Polling";
+
+ private boolean enabled = true;
+
+ public void listener(ActionEvent event) {
+ i++;
+ if (i == 7) {
+ enabled = false;
+ }
+ }
+
+ public String getText() {
+ return POLLING.substring(0, i);
+ }
+
+ /**
+ * @return the i
+ */
+ public Integer getI() {
+ return i;
+ }
+
+ /**
+ * @param i the i to set
+ */
+ public void setI(Integer i) {
+ this.i = i;
+ }
+
+ /**
+ * @return the enabled
+ */
+ public boolean isEnabled() {
+ return enabled;
+ }
+
+ /**
+ * @param enabled the enabled to set
+ */
+ public void setEnabled(boolean enabled) {
+ this.enabled = enabled;
+ }
+
+
+
+}
Modified: trunk/test-applications/seleniumTest/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/test-applications/seleniumTest/src/main/webapp/WEB-INF/faces-config.xml 2008-04-28 13:45:32 UTC (rev 8235)
+++ trunk/test-applications/seleniumTest/src/main/webapp/WEB-INF/faces-config.xml 2008-04-28 14:02:27 UTC (rev 8236)
@@ -51,5 +51,10 @@
<managed-bean-name>statusBean</managed-bean-name>
<managed-bean-class>org.ajax4jsf.A4JStatusTestBean</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
+ </managed-bean>
+ <managed-bean>
+ <managed-bean-name>pollBean</managed-bean-name>
+ <managed-bean-class>org.ajax4jsf.A4JPollTestBean</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
</managed-bean>
</faces-config>
\ No newline at end of file
Added: trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxPoll/ajaxPollTest.xhtml
===================================================================
--- trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxPoll/ajaxPollTest.xhtml (rev 0)
+++ trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxPoll/ajaxPollTest.xhtml 2008-04-28 14:02:27 UTC (rev 8236)
@@ -0,0 +1,18 @@
+<!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.template}">
+ <ui:define name="component">
+ <h:form id="_form">
+ <a4j:poll interval="700" id="poll" enabled="#{pollBean.enabled}" actionListener="#{pollBean.listener}" reRender="_value, _text"></a4j:poll><br/>
+ <h:inputHidden id="_value" value="#{pollBean.i}"/>
+ <h:outputText id="_text" value="#{pollBean.text}" />
+ </h:form>
+ </ui:define>
+</ui:composition>
+</html>
\ No newline at end of file
Modified: trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/SeleniumTestBase.java
===================================================================
--- trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/SeleniumTestBase.java 2008-04-28 13:45:32 UTC (rev 8235)
+++ trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/SeleniumTestBase.java 2008-04-28 14:02:27 UTC (rev 8236)
@@ -227,7 +227,6 @@
public void waitForAjaxCompletion() {
waitForAjaxCompletion(ajaxCompletionTime);
}
-
/**
* Waits while simple request will be completed
@@ -240,6 +239,16 @@
}
/**
+ * Waits for condition
+ * @param condition
+ * @param miliseconds
+ */
+ public void waiteForCondition(String condition, int miliseconds) {
+ selenium.waitForCondition(WINDOW_JS_RESOLVER + condition, String.valueOf(miliseconds));
+ checkJSError();
+ }
+
+ /**
* Waits while simple request will be completed
*
*/
Added: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/AjaxPollTest.java
===================================================================
--- trunk/test-applications/seleniumTest/src/test/java/org/richfaces/AjaxPollTest.java (rev 0)
+++ trunk/test-applications/seleniumTest/src/test/java/org/richfaces/AjaxPollTest.java 2008-04-28 14:02:27 UTC (rev 8236)
@@ -0,0 +1,75 @@
+/**
+ *
+ */
+package org.richfaces;
+
+import org.ajax4jsf.test.base.RichSeleniumTest;
+import org.ajax4jsf.test.base.SeleniumTestBase;
+import org.ajax4jsf.test.base.Templates;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
+
+/**
+ * @author Andrey Markavstov
+ *
+ */
+public class AjaxPollTest extends SeleniumTestBase implements RichSeleniumTest {
+
+ public AjaxPollTest() {
+ super("http", "localhost", "8080");
+ }
+
+ /**
+ * This method are invoking before selenium tests started
+ */
+ @BeforeTest
+ @Parameters( { "browser" })
+ public void startSelenium(String browser) {
+ super.startSelenium(browser);
+ }
+
+ /**
+ * This method are invoking after selenium tests completed
+ */
+ @AfterTest
+ public void stopSelenium() {
+ super.stopSelenium();
+ }
+
+ @Test
+ public void testAjaxPollComponent() {
+ _testAjaxPollComponent(Templates.SIMPLE);
+ _testAjaxPollComponent(Templates.DATATABLE);
+ }
+
+ private void _testAjaxPollComponent(Templates template) {
+ renderPage(getTestUrl(), template);
+ String parentId = getParentId() + "_form:";
+ String pollId = parentId + "poll";
+ String inputId = parentId + "_value";
+
+ writeStatus("Polling in progress...");
+ AssertValueEquals(inputId, "1");
+ pause(1500, pollId);
+ AssertValueNotEquals(inputId, "1");
+ waiteForCondition("document.getElementById('"+inputId+"').value == 7", 7000);
+
+ pause(1500, pollId);
+ writeStatus("Polling should be stopped...");
+ AssertValueEquals(inputId, "7");
+ AssertTextEquals(parentId + "_text", "Polling");
+
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.ajax4jsf.test.base.RichSeleniumTest#getTestUrl()
+ */
+ public String getTestUrl() {
+ return "/faces/pages/ajaxPoll/ajaxPollTest.xhtml";
+ }
+
+}
16 years, 8 months
JBoss Rich Faces SVN: r8235 - trunk/test-applications/seleniumTest/src/test/java/org/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: dsvyatobatsko
Date: 2008-04-28 09:45:32 -0400 (Mon, 28 Apr 2008)
New Revision: 8235
Modified:
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/JSFunctionTest.java
Log:
Modified: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/JSFunctionTest.java
===================================================================
--- trunk/test-applications/seleniumTest/src/test/java/org/richfaces/JSFunctionTest.java 2008-04-28 13:39:13 UTC (rev 8234)
+++ trunk/test-applications/seleniumTest/src/test/java/org/richfaces/JSFunctionTest.java 2008-04-28 13:45:32 UTC (rev 8235)
@@ -40,17 +40,18 @@
private void _testJSFunctionComponent(Templates template) {
renderPage("/faces/pages/jsFunction/jsFunctionTest.xhtml", template);
+ String showNameElemId = getParentId() + "showname";
selenium.mouseOver("alex");
waitForAjaxCompletion();
- assertEquals(getTextById("alex"), "Alex");
+ assertEquals(getTextById(showNameElemId), "Alex");
selenium.mouseOver("jonh");
waitForAjaxCompletion();
- assertEquals(getTextById("jonh"), "Jonh");
+ assertEquals(getTextById(showNameElemId), "Jonh");
selenium.mouseOver("roger");
waitForAjaxCompletion();
- assertEquals(getTextById("roger"), "Roger");
+ assertEquals(getTextById(showNameElemId), "Roger");
}
}
16 years, 8 months
JBoss Rich Faces SVN: r8234 - trunk/ui/inputnumber-spinner/src/main/templates.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2008-04-28 09:39:13 -0400 (Mon, 28 Apr 2008)
New Revision: 8234
Modified:
trunk/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx
Log:
http://jira.jboss.com/jira/browse/RF-3278
Modified: trunk/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx
===================================================================
--- trunk/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx 2008-04-28 13:08:25 UTC (rev 8233)
+++ trunk/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx 2008-04-28 13:39:13 UTC (rev 8234)
@@ -56,7 +56,7 @@
onmouseup='#{component.attributes["oninputmouseup"]}'
/>
</td>
- <td id="#{clientId}For" class="dr-spnr-b" width="1%">
+ <td id="#{clientId}For" class="dr-spnr-b rich-spinner-buttons" width="1%">
<table id="#{clientId}Buttons" border="0" cellspacing="0" cellpadding="0">
<tbody>
<tr>
16 years, 8 months
JBoss Rich Faces SVN: r8233 - trunk/test-applications/seleniumTest/src/main/webapp/layout.
by richfaces-svn-commits＠lists.jboss.org
Author: dsvyatobatsko
Date: 2008-04-28 09:08:25 -0400 (Mon, 28 Apr 2008)
New Revision: 8233
Removed:
trunk/test-applications/seleniumTest/src/main/webapp/layout/template.xhtml
Log:
continuation
Deleted: trunk/test-applications/seleniumTest/src/main/webapp/layout/template.xhtml
===================================================================
--- trunk/test-applications/seleniumTest/src/main/webapp/layout/template.xhtml 2008-04-28 13:05:21 UTC (rev 8232)
+++ trunk/test-applications/seleniumTest/src/main/webapp/layout/template.xhtml 2008-04-28 13:08:25 UTC (rev 8233)
@@ -1,112 +0,0 @@
-<!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:h="http://java.sun.com/jsf/html"
- xmlns:rich="http://richfaces.org/rich"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets">
-<head>
- <script>
- var errorMessage = null;
- var pauseHolder = {};
- window.onerror = function (message, url, code) {
- errorMessage = message;
- };
- function checkError () {
- return errorMessage;
- }
-
- function pause (miliseconds, id) {
- pauseHolder[id] = false;
- window.setTimeout(function () { pauseHolder[id] = true; }, miliseconds);
- }
-
- function submitForm () {
- document.getElementById('_form').submit();
- }
-
- function reRenderAll () {
- document.getElementById('_Selenium_Test_ReRender_Form:_reRender').onclick();
- return;
- }
- </script>
- <style type="text/css">
- <ui:insert name="style"/>
- </style>
-</head>
-<f:view>
-<body>
-<div style="padding: 10px; font-size: 24px;">Rich faces component testing by Selenium</div><br/>
-<h:form id="_Selenium_Test_ReRender_Form">
- <table border="0" cellpadding="5" cellspacing="0">
- <tr>
- <td colspan="2">
- <a4j:commandLink reRender="_Selenium_Test_Form1, _Selenium_Test_Form2" style="text-decoration: underline; color: blue" value="ReRenderAll" id="_reRender"/>
- </td>
- </tr>
- <!-- tr>
- <td>
- <b>Ajax Status:</b>
- </td>
- <td>
- <a4j:status startText="Ajax in progress...">
- <f:facet name="stop">
- <h:outputText value="Completed" style="color: green"></h:outputText>
- </f:facet>
- <f:facet name="start">
- <h:outputText value="In progress..." style="color: red"></h:outputText>
- </f:facet>
- </a4j:status>
- </td>
- </tr-->
- </table>
-</h:form>
-<br/>
-<div id="_Selenium_Test_ControlPoint1" style="display: none;">Control1</div>
- <br/>
-<table border="0" cellpadding="0" cellspacing="10"><tr><td style="vertical-align: top">
- <rich:dataTable value="1" id="_Selenium_Test_Description">
- <h:column>
- <f:facet name="header">
- <h:outputText value="Description area"></h:outputText>
- </f:facet>
- <ui:insert name="description"></ui:insert>
- </h:column>
- </rich:dataTable>
-</td></tr></table>
-
- <br/><br/>
-<table border="0" cellpadding="0" cellspacing="10"><tr><td style="vertical-align: top">
-<h:form id="_Selenium_Test_Form1">
- <rich:dataTable value="1" id="_Selenium_Test_DataTable" style="width: auto">
- <h:column>
- <f:facet name="header">
- <h:outputText value="Testing area inside Data Table"></h:outputText>
- </f:facet>
- <ui:insert name="component" />
- </h:column>
- </rich:dataTable>
-</h:form>
-</td>
-<td style="width: 20px">
-</td>
-<td style="vertical-align: top">
-<h:form id="_Selenium_Test_Form2">
- <rich:panel id="_Selenium_Test_Panel">
- <f:facet name="header">
- <h:outputText value="Testing area inside Panel"></h:outputText>
- </f:facet>
- <ui:insert name="component" />
- </rich:panel>
-</h:form>
-</td></tr></table>
-
-
-<script type="text/javascript">
- window.done=false;A4J.AJAX.AddListener(new A4J.AJAX.Listener(function(){window.done=true}));
-</script>
-
-<div id="_Selenium_Test_ControlPoint2" style="display: none;">Control2</div>
-</body>
-</f:view>
-</html>
\ No newline at end of file
16 years, 8 months
JBoss Rich Faces SVN: r8232 - trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2008-04-28 09:05:21 -0400 (Mon, 28 Apr 2008)
New Revision: 8232
Modified:
trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-selection.js
Log:
http://jira.jboss.com/jira/browse/RF-3280
http://jira.jboss.com/jira/browse/RF-2983
Modified: trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-selection.js
===================================================================
--- trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-selection.js 2008-04-28 13:02:50 UTC (rev 8231)
+++ trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-selection.js 2008-04-28 13:05:21 UTC (rev 8232)
@@ -3,8 +3,8 @@
initialize: function(tree) {
this.tree = tree;
- this.eventKeyPress = this.processKeyDown.bindAsEventListener(this);
- Event.observe(document, "keydown", this.eventKeyPress);
+ this.eventKeyDown = this.processKeyDown.bindAsEventListener(this);
+ Event.observe(document, "keydown", this.eventKeyDown);
this.eventLostFocus = this.processLostFocus.bindAsEventListener(this);
Event.observe(document, "click", this.eventLostFocus);
@@ -12,9 +12,12 @@
this.eventPreventLostFocus = this.processPreventLostFocus.bindAsEventListener(this);
Event.observe(this.tree.element, "click", this.eventPreventLostFocus);
},
-
+
destroy: function() {
- Event.stopObserving(document, "keydown", this.eventKeyPress);
+ this.activeItem = null;
+ this.tree = null;
+
+ Event.stopObserving(document, "keydown", this.eventKeyDown);
Event.stopObserving(document, "click", this.eventLostFocus);
},
16 years, 8 months