November 2009 - richfaces-svn-commits

JBoss Rich Faces SVN: r15974 - root/framework/trunk/impl/src/main/resources/META-INF/resources.

by richfaces-svn-commits＠lists.jboss.org

Author: pyaschenko Date: 2009-11-23 07:27:12 -0500 (Mon, 23 Nov 2009) New Revision: 15974 Modified: root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js Log: ajax client library: queue. not tested enough Modified: root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js =================================================================== --- root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js 2009-11-23 04:18:27 UTC (rev 15973) +++ root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js 2009-11-23 12:27:12 UTC (rev 15974) @@ -5,7 +5,7 @@ jsf.ajax.request = function request(source, event, options) { //richfaces.ajax.request(source, event, options); richfaces.queue.push(source, event, options); - } + }; richfaces.queue = function(opts){ @@ -41,7 +41,7 @@ onRequestDelayPassed: function() { this.readyToSubmit = true; - this.queue.submitFirst(); // TODO: here we need to call query.submitFirst + submitFirst(); }, startTimer: function() { @@ -127,8 +127,9 @@ last = items.shift(); if (last.readyToSubmit) { log.debug("richfaces.queue: will submit request NOW"); - last.query.appendParameter("AJAX:EVENTS_COUNT", last.eventsCount); - richfaces.ajax.request(last.query, last.event, last.options); + //last.query.appendParameter("AJAX:EVENTS_COUNT", last.eventsCount); + var params = richfaces.processRequestParams(last.query, last.options); + richfaces.ajax.request(last.query, last.event, params); if (last.options.queueonsubmit) { last.options.queueonsubmit.call(last); } @@ -172,7 +173,7 @@ lastEntry.stopTimer(); entry.setEventsCount(lastEntry.getEventsCount() + 1); - this.items[lastIdx] = entry; + updateLastEntry(entry); } else { log.debug("Last queue entry is not the last anymore. Stopping requestDelay timer and marking entry as ready for submission") @@ -189,7 +190,7 @@ } entry.startTimer(); - submitFirst(); + //submitFirst(); }, pop: function () {

15 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r15973 - branches/community/3.3.X/ui/state/src/main/java/org/richfaces/ui/application.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2009-11-22 23:18:27 -0500 (Sun, 22 Nov 2009) New Revision: 15973 Modified: branches/community/3.3.X/ui/state/src/main/java/org/richfaces/ui/application/StateApplication.java Log: StateApplication compilation error fixed Modified: branches/community/3.3.X/ui/state/src/main/java/org/richfaces/ui/application/StateApplication.java =================================================================== --- branches/community/3.3.X/ui/state/src/main/java/org/richfaces/ui/application/StateApplication.java 2009-11-23 03:41:00 UTC (rev 15972) +++ branches/community/3.3.X/ui/state/src/main/java/org/richfaces/ui/application/StateApplication.java 2009-11-23 04:18:27 UTC (rev 15973) @@ -254,7 +254,7 @@ * @return * @see javax.faces.application.Application#getConverterTypes() */ - public Iterator<Class> getConverterTypes() { + public Iterator getConverterTypes() { return parent.getConverterTypes(); }

15 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r15972 - branches/community/3.3.X/samples.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2009-11-22 22:41:00 -0500 (Sun, 22 Nov 2009) New Revision: 15972 Modified: branches/community/3.3.X/samples/pom.xml Log: Samples not compileable - fixed: jsf1_2 profile made active by default Modified: branches/community/3.3.X/samples/pom.xml =================================================================== --- branches/community/3.3.X/samples/pom.xml 2009-11-23 03:35:59 UTC (rev 15971) +++ branches/community/3.3.X/samples/pom.xml 2009-11-23 03:41:00 UTC (rev 15972) @@ -147,11 +147,7 @@ <profile> <id>jsf1_2</id> <activation> - <activeByDefault>false</activeByDefault> - <property> - <name>jsfVersion</name> - <value>1.2</value> - </property> + <activeByDefault>true</activeByDefault> </activation> <build> <defaultGoal>jetty:run</defaultGoal>

15 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r15971 - branches/community/3.3.X/ui/state/src/main/java/org/richfaces/ui/application.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2009-11-22 22:35:59 -0500 (Sun, 22 Nov 2009) New Revision: 15971 Modified: branches/community/3.3.X/ui/state/src/main/java/org/richfaces/ui/application/StateApplication.java Log: StateApplication compilation error fixed Modified: branches/community/3.3.X/ui/state/src/main/java/org/richfaces/ui/application/StateApplication.java =================================================================== --- branches/community/3.3.X/ui/state/src/main/java/org/richfaces/ui/application/StateApplication.java 2009-11-23 03:02:45 UTC (rev 15970) +++ branches/community/3.3.X/ui/state/src/main/java/org/richfaces/ui/application/StateApplication.java 2009-11-23 03:35:59 UTC (rev 15971) @@ -254,7 +254,7 @@ * @return * @see javax.faces.application.Application#getConverterTypes() */ - public Iterator<Class<?>> getConverterTypes() { + public Iterator<Class> getConverterTypes() { return parent.getConverterTypes(); }

15 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r15970 - branches/community/3.3.X/framework/test/src/main/java/org/ajax4jsf/tests.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2009-11-22 22:02:45 -0500 (Sun, 22 Nov 2009) New Revision: 15970 Modified: branches/community/3.3.X/framework/test/src/main/java/org/ajax4jsf/tests/Ajax4JsfMockApplicationFactory.java Log: Minor optimization for JSF 2.0 mock application factory Added debug logger outputting JSF 2.0 vs 1.2/1.1 information Modified: branches/community/3.3.X/framework/test/src/main/java/org/ajax4jsf/tests/Ajax4JsfMockApplicationFactory.java =================================================================== --- branches/community/3.3.X/framework/test/src/main/java/org/ajax4jsf/tests/Ajax4JsfMockApplicationFactory.java 2009-11-23 02:53:20 UTC (rev 15969) +++ branches/community/3.3.X/framework/test/src/main/java/org/ajax4jsf/tests/Ajax4JsfMockApplicationFactory.java 2009-11-23 03:02:45 UTC (rev 15970) @@ -24,10 +24,14 @@ import javax.faces.FacesException; import javax.faces.application.Application; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.shale.test.mock.MockApplication; public class Ajax4JsfMockApplicationFactory extends org.apache.shale.test.mock.MockApplicationFactory { + private static final Log LOG = LogFactory.getLog(Ajax4JsfMockApplicationFactory.class); + private Application application; public Ajax4JsfMockApplicationFactory() { @@ -50,7 +54,7 @@ application = (MockApplication) clazz.newInstance(); - return application; + LOG.debug("Successfully created JSF 2.0 MockApplication class"); } catch (NoClassDefFoundError e) { clazz = null; // We are not running in a JSF 2.0 environment } catch (ClassNotFoundException e) { @@ -61,7 +65,12 @@ throw new FacesException(e); } - return super.getApplication(); + if (application == null) { + LOG.debug("Falling back to JSF 1.1/1.2 MockApplication"); + application = super.getApplication(); + } + + return application; } @Override

15 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r15969 - branches/community/3.3.X/framework/test/src/main/java/org/ajax4jsf/tests.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2009-11-22 21:53:20 -0500 (Sun, 22 Nov 2009) New Revision: 15969 Modified: branches/community/3.3.X/framework/test/src/main/java/org/ajax4jsf/tests/Ajax4JsfMockApplicationFactory.java branches/community/3.3.X/framework/test/src/main/java/org/ajax4jsf/tests/MockApplication20.java Log: Fixed JSF 2.0 artifacts breaking tests under JSF 1.2 Modified: branches/community/3.3.X/framework/test/src/main/java/org/ajax4jsf/tests/Ajax4JsfMockApplicationFactory.java =================================================================== --- branches/community/3.3.X/framework/test/src/main/java/org/ajax4jsf/tests/Ajax4JsfMockApplicationFactory.java 2009-11-23 02:30:43 UTC (rev 15968) +++ branches/community/3.3.X/framework/test/src/main/java/org/ajax4jsf/tests/Ajax4JsfMockApplicationFactory.java 2009-11-23 02:53:20 UTC (rev 15969) @@ -49,7 +49,6 @@ clazz.getDeclaredFields(); application = (MockApplication) clazz.newInstance(); - application.setResourceHandler(new MockResourceHandler()); return application; } catch (NoClassDefFoundError e) { Modified: branches/community/3.3.X/framework/test/src/main/java/org/ajax4jsf/tests/MockApplication20.java =================================================================== --- branches/community/3.3.X/framework/test/src/main/java/org/ajax4jsf/tests/MockApplication20.java 2009-11-23 02:30:43 UTC (rev 15968) +++ branches/community/3.3.X/framework/test/src/main/java/org/ajax4jsf/tests/MockApplication20.java 2009-11-23 02:53:20 UTC (rev 15969) @@ -33,7 +33,7 @@ public class MockApplication20 extends MockApplication { - private ResourceHandler resourceHandler = null; + private ResourceHandler resourceHandler = new MockResourceHandler(); public MockApplication20() { super();

15 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r15968 - in branches/community/3.3.X: samples/calendar-sample/src/main/webapp/pages and 20 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2009-11-22 21:30:43 -0500 (Sun, 22 Nov 2009) New Revision: 15968 Added: branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/RF-8001.jsp branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/RF-8071.jsp branches/community/3.3.X/samples/combobox-sample/src/main/webapp/pages/RF-8028.xhtml branches/community/3.3.X/samples/dropdownmenu-sample/src/main/webapp/images/home.png branches/community/3.3.X/samples/dropdownmenu-sample/src/main/webapp/pages/RF-7990.jsp branches/community/3.3.X/samples/inputNumberSliderDemo/src/main/webapp/pages/RF-8152.xhtml Removed: branches/community/3.3.X/ui/editor/src/test/java/org/richfaces/seamparser/HtmlSeamParserTest.java.cp1251 Modified: branches/community/3.3.X/samples/calendar-sample/src/main/java/org/richfaces/CalendarBean.java branches/community/3.3.X/samples/dropdownmenu-sample/pom.xml branches/community/3.3.X/samples/dropdownmenu-sample/src/main/java/org/richfaces/samples/dropdownmenu/Bean.java branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/richfaces/extendedDataTable/examples/simple.xhtml branches/community/3.3.X/samples/themes/pom.xml branches/community/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java branches/community/3.3.X/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js branches/community/3.3.X/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx branches/community/3.3.X/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js branches/community/3.3.X/ui/contextMenu/src/main/resources/org/richfaces/renderkit/html/scripts/context-menu.js branches/community/3.3.X/ui/editor/ branches/community/3.3.X/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/css/slider.xcss branches/community/3.3.X/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js branches/community/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java branches/community/3.3.X/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js branches/community/3.3.X/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx Log: Bug fixes: merged from 3.3.x_jsf2 branch Modified: branches/community/3.3.X/samples/calendar-sample/src/main/java/org/richfaces/CalendarBean.java =================================================================== --- branches/community/3.3.X/samples/calendar-sample/src/main/java/org/richfaces/CalendarBean.java 2009-11-23 02:22:47 UTC (rev 15967) +++ branches/community/3.3.X/samples/calendar-sample/src/main/java/org/richfaces/CalendarBean.java 2009-11-23 02:30:43 UTC (rev 15968) @@ -31,15 +31,14 @@ /** * 20/07/2007 - * + * * @author Alexej Kushunin * @mailto: akushunin(a)exadel.com - * */ public class CalendarBean { - private static final String[] WEEK_DAY_LABELS = new String[] { "Sun *", - "Mon +", "Tue +", "Wed +", "Thu +", "Fri +", "Sat *" }; + private static final String[] WEEK_DAY_LABELS = new String[]{"Sun *", + "Mon +", "Tue +", "Wed +", "Thu +", "Fri +", "Sat *"}; private Locale locale; private boolean popup; @@ -55,15 +54,14 @@ private String direction; private String boundary; private String todayControlMode; + private boolean showApply; private boolean showHeader; private boolean showFooter; private boolean resetTimeOnDateSelect; private int counter; - - - - + + private boolean useCustomDayLabels; public Locale getLocale() { @@ -87,7 +85,7 @@ } public void setPattern(String pattern) { - + this.pattern = pattern; } @@ -106,16 +104,16 @@ jointPoint = "bottom-left"; direction = "bottom-right"; readonly = true; - enableManualInput=false; - showInput=true; + enableManualInput = false; + showInput = true; boundary = "inactive"; disabled = false; todayControlMode = "select"; resetTimeOnDateSelect = false; - + } - - + + public boolean isShowInput() { return showInput; } @@ -223,14 +221,16 @@ public void setBoundary(String boundary) { this.boundary = boundary; } - public void dcl(CurrentDateChangeEvent event){ + + public void dcl(CurrentDateChangeEvent event) { System.out.println(event.getCurrentDateString()); System.out.println("ajvhckndskncs"); } - public void ddd(ValueChangeEvent event){ + + public void ddd(ValueChangeEvent event) { System.out.println(event.getOldValue()); System.out.println(event.getNewValue()); - + } public int getCounter() { @@ -284,4 +284,12 @@ public void setResetTimeOnDateSelect(boolean resetTimeOnDateSelect) { this.resetTimeOnDateSelect = resetTimeOnDateSelect; } + + public boolean isShowApply() { + return showApply; + } + + public void setShowApply(boolean showApply) { + this.showApply = showApply; + } } \ No newline at end of file Added: branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/RF-8001.jsp =================================================================== --- branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/RF-8001.jsp (rev 0) +++ branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/RF-8001.jsp 2009-11-23 02:30:43 UTC (rev 15968) @@ -0,0 +1,27 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/calendar" prefix="rich" %> +<html> +<head> + <title></title> +</head> +<body dir="rtl"> +<f:view> + <h:form id="f"> + <rich:calendar value="#{calendarBean.selectedDate}" + locale="#{calendarBean.locale}" + popup="#{calendarBean.popup}" + datePattern="#{calendarBean.pattern}" + showApplyButton="#{calendarBean.showApply}"> + + <f:facet name="weekDay"> + <h:outputText value="{weekDayLabelShort}"/> + </f:facet> + <f:facet name="weekNumber"> + <h:outputText value="1"/> + </f:facet> + </rich:calendar> + </h:form> +</f:view> +</body> +</html> \ No newline at end of file Added: branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/RF-8071.jsp =================================================================== --- branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/RF-8071.jsp (rev 0) +++ branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/RF-8071.jsp 2009-11-23 02:30:43 UTC (rev 15968) @@ -0,0 +1,21 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/calendar" prefix="rich" %> +<html> +<head> + <title>RF-8071 Calendar: "NaN" is displayed for selected date</title> +</head> +<body> +<f:view> + <h:form id="f"> + <rich:calendar + id="inputValidFrom" + datePattern="dd-MMM-yyyy" + showFooter="false" + required="true" + requiredMessage="msg.error_validFromNotEmpty" + enableManualInput="true" /> + </h:form> +</f:view> +</body> +</html> \ No newline at end of file Copied: branches/community/3.3.X/samples/combobox-sample/src/main/webapp/pages/RF-8028.xhtml (from rev 15959, branches/sandbox/3.3.X_JSF2/samples/combobox-sample/src/main/webapp/pages/RF-8028.xhtml) =================================================================== --- branches/community/3.3.X/samples/combobox-sample/src/main/webapp/pages/RF-8028.xhtml (rev 0) +++ branches/community/3.3.X/samples/combobox-sample/src/main/webapp/pages/RF-8028.xhtml 2009-11-23 02:30:43 UTC (rev 15968) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!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:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:cmb="http://labs.jboss.com/jbossrichfaces/ui/combobox" + xmlns:a4j="http://richfaces.org/a4j" + > +<body dir="rtl"> + <f:view> + <h:form id="f"> + <cmb:comboBox id="combo" onchange="#{bean.onchangeScript}" onlistcall="#{bean.onlistcallScript}" > + <f:selectItem itemValue="Oregon" /> + <f:selectItem itemValue="Pennsylvania Oregonfdsf fdsfdsfds dsffdsfdsfdsf fdsfdsfwdsfsfsd fdsfdsfdsfds dfsfdsfdsfds"/> + <f:selectItem itemValue="J'uneau"/> + </cmb:comboBox> + </h:form> + </f:view> +</body> +</html> \ No newline at end of file Modified: branches/community/3.3.X/samples/dropdownmenu-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/dropdownmenu-sample/pom.xml 2009-11-23 02:22:47 UTC (rev 15967) +++ branches/community/3.3.X/samples/dropdownmenu-sample/pom.xml 2009-11-23 02:30:43 UTC (rev 15968) @@ -1,37 +1,47 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>samples</artifactId> - <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.samples</groupId> - <artifactId>dropdownmenu-sample</artifactId> - <packaging>war</packaging> - <name>webapp Maven Webapp</name> - <build> - <finalName>dropdownmenu-sample</finalName> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>dropdown-menu</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>menu-components</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.samples</groupId> - <artifactId>skins</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> -</project> \ No newline at end of file +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>samples</artifactId> + <groupId>org.richfaces</groupId> + <version>3.3.3-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples</groupId> + <artifactId>dropdownmenu-sample</artifactId> + <packaging>war</packaging> + <name>webapp Maven Webapp</name> + <build> + <finalName>dropdownmenu-sample</finalName> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>dropdown-menu</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>menu-components</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.samples</groupId> + <artifactId>skins</artifactId> + <version>${project.version}</version> + </dependency> + +  + + </dependencies> +</project> Modified: branches/community/3.3.X/samples/dropdownmenu-sample/src/main/java/org/richfaces/samples/dropdownmenu/Bean.java =================================================================== --- branches/community/3.3.X/samples/dropdownmenu-sample/src/main/java/org/richfaces/samples/dropdownmenu/Bean.java 2009-11-23 02:22:47 UTC (rev 15967) +++ branches/community/3.3.X/samples/dropdownmenu-sample/src/main/java/org/richfaces/samples/dropdownmenu/Bean.java 2009-11-23 02:30:43 UTC (rev 15968) @@ -22,7 +22,6 @@ package org.richfaces.samples.dropdownmenu; import javax.faces.event.ActionEvent; -import org.richfaces.component.UIMenuItem; /** * @author $Autor$ @@ -101,7 +100,7 @@ public void setHorizontalOffsets(String horizontalOffsets) { this.horizontalOffsets = horizontalOffsets; - setHorizontalOffset(new Integer(this.horizontalOffsets).intValue()); + setHorizontalOffset(Integer.parseInt(this.horizontalOffsets)); } public String getHorizontalOffsets() { @@ -110,7 +109,7 @@ public void setVerticalOffsets(String verticalOffsets) { this.verticalOffsets = verticalOffsets; - setVerticalOffset(new Integer(this.verticalOffsets).intValue()); + setVerticalOffset(Integer.parseInt(this.verticalOffsets)); } public String getVerticalOffsets() { Copied: branches/community/3.3.X/samples/dropdownmenu-sample/src/main/webapp/images/home.png (from rev 15949, branches/sandbox/3.3.X_JSF2/samples/dropdownmenu-sample/src/main/webapp/images/home.png) =================================================================== (Binary files differ) Copied: branches/community/3.3.X/samples/dropdownmenu-sample/src/main/webapp/pages/RF-7990.jsp (from rev 15949, branches/sandbox/3.3.X_JSF2/samples/dropdownmenu-sample/src/main/webapp/pages/RF-7990.jsp) =================================================================== --- branches/community/3.3.X/samples/dropdownmenu-sample/src/main/webapp/pages/RF-7990.jsp (rev 0) +++ branches/community/3.3.X/samples/dropdownmenu-sample/src/main/webapp/pages/RF-7990.jsp 2009-11-23 02:30:43 UTC (rev 15968) @@ -0,0 +1,30 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/menu-components" prefix="mc" %> +<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/toolBar" prefix="tb" %> + +<html> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> + <title>RF-7990 Test Page </title> +</head> +<body> +<f:view> + <h:form id="f"> + <tb:toolBar id="t"> + <mc:menuItem + id="item" + submitMode="server" + action="internalIndex" + style="color: red;" + styleClass="first"> + <h:graphicImage value="/images/home.png" styleClass="menuIcon"/> + <h:panelGroup styleClass="menuLabel"> + <h:outputText value="Hello"/> + </h:panelGroup> + </mc:menuItem> + </tb:toolBar> + </h:form> +</f:view> +</body> +</html> \ No newline at end of file Copied: branches/community/3.3.X/samples/inputNumberSliderDemo/src/main/webapp/pages/RF-8152.xhtml (from rev 15961, branches/sandbox/3.3.X_JSF2/samples/inputNumberSliderDemo/src/main/webapp/pages/RF-8152.xhtml) =================================================================== --- branches/community/3.3.X/samples/inputNumberSliderDemo/src/main/webapp/pages/RF-8152.xhtml (rev 0) +++ branches/community/3.3.X/samples/inputNumberSliderDemo/src/main/webapp/pages/RF-8152.xhtml 2009-11-23 02:30:43 UTC (rev 15968) @@ -0,0 +1,15 @@ +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://labs.jboss.com/jbossrichfaces/ui/inputnumber-slider" + xmlns:ui="http://java.sun.com/jsf/facelets"> + +<body> +<f:view> + <h:form id="f"> + <rich:inputNumberSlider id="input" value="#{bean.value}" orientation="vertical" /> + </h:form> +</f:view> +</body> +</html> Modified: branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/richfaces/extendedDataTable/examples/simple.xhtml =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/richfaces/extendedDataTable/examples/simple.xhtml 2009-11-23 02:22:47 UTC (rev 15967) +++ branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/richfaces/extendedDataTable/examples/simple.xhtml 2009-11-23 02:30:43 UTC (rev 15968) @@ -7,7 +7,7 @@ xmlns:rich="http://richfaces.org/rich"> <ui:composition> - <h:form> + <h:form id="form"> <h:panelGrid columns="2" columnClasses="top , top"> <rich:extendedDataTable value="#{extendedTableBean.capitalsDataModel}" var="cap" id="table" @@ -16,35 +16,35 @@ selectionMode="#{extendedTableBean.selectionMode}" tableState="#{extendedTableBean.tableState}" selection="#{extendedTableBean.selection}"> - <rich:column sortable="false" label="Flag"> + <rich:column sortable="false" label="Flag" id="col_1"> <f:facet name="header"> - <h:outputText value="Flag" /> + <h:outputText value="Flag" id="flag"/> </f:facet> - <h:graphicImage value="#{cap.stateFlag}" /> + <h:graphicImage value="#{cap.stateFlag}" id="cap_state_flag"/> </rich:column> - <rich:column sortable="true" sortBy="#{cap.state}" + <rich:column sortable="true" sortBy="#{cap.state}" id="col_2" filterBy="#{cap.state}" filterEvent="onkeyup" width="170px" label="State Name"> <f:facet name="header"> - <h:outputText value="State Name" /> + <h:outputText value="State Name" id="state_name"/> </f:facet> - <h:outputText value="#{cap.state}" /> + <h:outputText value="#{cap.state}" id="cap_state"/> </rich:column> - <rich:column sortable="true" sortBy="#{cap.name}" + <rich:column sortable="true" sortBy="#{cap.name}" id="col_3" filterBy="#{cap.name}" filterEvent="onkeyup" width="170px" label="State Capital"> <f:facet name="header"> - <h:outputText value="State Capital" /> + <h:outputText value="State Capital" id="state_capital"/> </f:facet> - <h:outputText value="#{cap.name}" /> + <h:outputText value="#{cap.name}" id="cap_name"/> </rich:column> - <rich:column sortable="false" label="Time Zone"> + <rich:column sortable="false" label="Time Zone" id="col_4"> <f:facet name="header"> - <h:outputText value="Time Zone" /> + <h:outputText value="Time Zone" id="time_zone"/> </f:facet> - <h:outputText value="#{cap.timeZone}" /> + <h:outputText value="#{cap.timeZone}" id="cap_time_zone"/> </rich:column> - <a4j:support reRender="selectiontable" + <a4j:support reRender="selectiontable" id="extended_table_bean_take_selection" action="#{extendedTableBean.takeSelection}" event="onselectionchange" /> </rich:extendedDataTable> @@ -58,11 +58,11 @@ <h:selectOneMenu value="#{extendedTableBean.sortMode}"> <f:selectItem itemLabel="Single" itemValue="single" /> <f:selectItem itemLabel="Multi" itemValue="multi" /> - <a4j:support event="onchange" ajaxSingle="true" reRender="table" /> + <a4j:support event="onchange" ajaxSingle="true" reRender="table" id="support_sort_onchange"/> </h:selectOneMenu> <h:outputText value="Selection Mode:" /> <h:selectOneMenu value="#{extendedTableBean.selectionMode}"> - <a4j:support ajaxSingle="true" event="onchange" reRender="table" /> + <a4j:support ajaxSingle="true" event="onchange" reRender="table" id="support_select_onchange"/> <f:selectItem itemLabel="Single" itemValue="single" /> <f:selectItem itemLabel="Multi" itemValue="multi" /> <f:selectItem itemLabel="None" itemValue="none" /> Modified: branches/community/3.3.X/samples/themes/pom.xml =================================================================== --- branches/community/3.3.X/samples/themes/pom.xml 2009-11-23 02:22:47 UTC (rev 15967) +++ branches/community/3.3.X/samples/themes/pom.xml 2009-11-23 02:30:43 UTC (rev 15968) @@ -1,44 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>samples</artifactId> - <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> - </parent> - <groupId>org.richfaces.samples</groupId> - <artifactId>themes</artifactId> - <version>3.3.3-SNAPSHOT</version> - <name>themes</name> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> - <executions> - <execution> - <id>generate-sources</id> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui</artifactId> - <version>3.3.3-SNAPSHOT</version> - </dependency> - </dependencies> -</project> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>samples</artifactId> + <groupId>org.richfaces</groupId> + <version>3.3.3-SNAPSHOT</version> + </parent> + <groupId>org.richfaces.samples</groupId> + <artifactId>themes</artifactId> + <version>3.3.3-SNAPSHOT</version> + <name>themes</name> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.3.3-SNAPSHOT</version> + <executions> + <execution> + <id>generate-sources</id> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <inherited>true</inherited> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui</artifactId> + <version>3.3.3-SNAPSHOT</version> + </dependency> + </dependencies> +</project> Modified: branches/community/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java =================================================================== --- branches/community/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2009-11-23 02:22:47 UTC (rev 15967) +++ branches/community/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2009-11-23 02:30:43 UTC (rev 15968) @@ -21,32 +21,6 @@ package org.richfaces.renderkit; -import java.io.IOException; -import java.text.DateFormatSymbols; -import java.text.Format; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.Locale; -import java.util.Map; -import java.util.MissingResourceException; -import java.util.ResourceBundle; -import java.util.Set; -import java.util.TimeZone; - -import javax.el.ValueExpression; -import javax.faces.application.Application; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; -import javax.faces.convert.Converter; -import javax.faces.convert.ConverterException; -import javax.faces.convert.DateTimeConverter; -import javax.faces.event.PhaseId; - import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.event.AjaxEvent; import org.ajax4jsf.javascript.JSFunction; @@ -57,12 +31,31 @@ import org.ajax4jsf.renderkit.RendererUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.richfaces.component.TemplateComponent; import org.richfaces.component.UICalendar; import org.richfaces.component.util.ComponentUtil; import org.richfaces.component.util.MessageUtil; import org.richfaces.context.RequestContext; import org.richfaces.event.CurrentDateChangeEvent; +import org.richfaces.json.JSONObject; +import javax.el.ValueExpression; +import javax.faces.application.Application; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; +import javax.faces.convert.Converter; +import javax.faces.convert.ConverterException; +import javax.faces.convert.DateTimeConverter; +import javax.faces.event.PhaseId; +import java.io.IOException; +import java.io.StringWriter; +import java.io.Writer; +import java.text.DateFormatSymbols; +import java.text.Format; +import java.text.SimpleDateFormat; +import java.util.*; + /** * @author Nick Belaevski - mailto:nbelaevski@exadel.com created 08.06.2007 * @@ -187,7 +180,7 @@ * Returns hours and minutes from "defaultTime" attribute as a String with * special format: hours:"value_hours",minutes:"value_minutes" * - * @param calendar - UICalendar + * @param component - UICalendar * * @return hours and minutes from "defaultTime" attribute */ @@ -286,7 +279,6 @@ /** * Creates default <code>DateTimeConverter</code> for the calendar - * @param calendar - calendar component * * @return created converter */ @@ -317,6 +309,7 @@ return converter; } + @Override protected void doDecode(FacesContext context, UIComponent component) { // TODO Auto-generated method stub super.doDecode(context, component); @@ -353,6 +346,7 @@ } } + @Override public void encodeChildren(FacesContext context, UIComponent calendar) throws IOException { @@ -378,22 +372,52 @@ } return null; - } + } - public void writeMarkupScriptBody(FacesContext context, - UIComponent component, boolean children) throws IOException { - writeScriptBody(context, component, children); + public String getMarkupScriptBody(FacesContext context, UIComponent component, boolean children) + throws IOException { + + ResponseWriter writer = context.getResponseWriter(); + Writer dumpingWriter = new StringWriter(); + ResponseWriter clonedWriter = writer.cloneWithWriter(dumpingWriter); + context.setResponseWriter(clonedWriter); + + TemplateComponent templateComponent = null; + if (component instanceof TemplateComponent) { + templateComponent = (TemplateComponent) component; } - public void writeOptionalFacetMarkupScriptBody(FacesContext context, + try { + if (templateComponent != null) { + templateComponent.startTemplateEncode(); + } + + if (children) { + this.renderChildren(context, component); + } else { + this.renderChild(context, component); + } + } finally { + if (templateComponent != null) { + templateComponent.endTemplateEncode(); + } + + clonedWriter.flush(); + context.setResponseWriter(writer); + } + + return dumpingWriter.toString(); + } + + public String getOptionalFacetMarkupScriptBody(FacesContext context, UIComponent component, String facetName) throws IOException { UIComponent facet = component.getFacet(facetName); if (facet != null && facet.isRendered()) { - ResponseWriter writer = context.getResponseWriter(); - writer.writeText(",\n " + facetName + MARKUP_SUFFIX + ": ", null); - writeMarkupScriptBody(context, facet, false); + return getMarkupScriptBody(context, facet, false); } + + return null; } public void dayCellClass(FacesContext context, UIComponent component) @@ -443,16 +467,29 @@ return null; } - public void writeFacetMarkupScriptBody(FacesContext context, - UIComponent component, String facetName) throws IOException { + public void writeFacetMarkup(FacesContext context, UIComponent component) throws IOException { + Map<String, String> jsonMap = new HashMap(); + if (component.getChildCount() != 0) { + jsonMap.put("dayListMarkup", getMarkupScriptBody(context, component, true)); + } - UIComponent facet = component.getFacet(facetName); - if (facet != null && facet.isRendered()) { - ResponseWriter writer = context.getResponseWriter(); - writer.writeText(",\n " + facetName + MARKUP_SUFFIX + ": ", null); - writeMarkupScriptBody(context, facet, false); + addFacetMarkupScriptBody(context, component, jsonMap, "optionalHeader"); + addFacetMarkupScriptBody(context, component, jsonMap, "optionalFooter"); + + addFacetMarkupScriptBody(context, component, jsonMap, "weekDay"); + addFacetMarkupScriptBody(context, component, jsonMap, "weekNumber"); + addFacetMarkupScriptBody(context, component, jsonMap, "header"); + addFacetMarkupScriptBody(context, component, jsonMap, "footer"); + + context.getResponseWriter().write(new JSONObject(jsonMap).toString()); } + + private void addFacetMarkupScriptBody(FacesContext context, UIComponent component, Map<String, String> jsonMap, String facetName) throws IOException { + String res = getOptionalFacetMarkupScriptBody(context, component, facetName); + if (res != null) { + jsonMap.put(facetName, res); } + } public void writePreloadBody(FacesContext context, UICalendar calendar) throws IOException { Modified: branches/community/3.3.X/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js =================================================================== --- branches/community/3.3.X/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2009-11-23 02:22:47 UTC (rev 15967) +++ branches/community/3.3.X/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2009-11-23 02:30:43 UTC (rev 15968) @@ -288,10 +288,16 @@ return value; }; -Richfaces.Calendar.getMonthByLabel = function (monthLabel, monthNames) -{ - var i=0; - while (i<monthNames.length) if (monthNames[i]==monthLabel) return i; else i++; +Richfaces.Calendar.getMonthByLabel = function (monthLabel, monthNames) { + var toLowerMonthLabel = monthLabel.toLowerCase(); + var i = 0; + while (i < monthNames.length) { + if (monthNames[i].toLowerCase() == toLowerMonthLabel) { + return i; + } + + i++; + } }; Object.extend(Event, { @@ -351,22 +357,17 @@ var re = /([.*+?^<>=!:${}()[\]\/\\])/g; var monthNamesStr var monthNamesShortStr; - if (!monthNames) - { + if (!monthNames) { monthNames = Richfaces.Calendar.getDefaultMonthNames(); monthNamesStr = monthNames.join('|'); - } - else - { + } else { monthNamesStr = monthNames.join('|').replace(re, '\\$1'); } - if (!monthNamesShort) - { + + if (!monthNamesShort) { monthNamesShort = Richfaces.Calendar.getDefaultMonthNames(true); monthNamesShortStr = monthNamesShort.join('|'); - } - else - { + } else { monthNamesShortStr = monthNamesShort.join('|').replace(re, '\\$1'); } Modified: branches/community/3.3.X/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx =================================================================== --- branches/community/3.3.X/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2009-11-23 02:22:47 UTC (rev 15967) +++ branches/community/3.3.X/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2009-11-23 02:30:43 UTC (rev 15968) @@ -193,25 +193,10 @@ </c:if> <c:if test="#{empty options}"> {} - </c:if>, { + </c:if>, + <f:call name="writeFacetMarkup" /> + ).load( <jsp:scriptlet>/*<![CDATA[*/ - if (component.getChildCount() != 0) { - /*]]>*/</jsp:scriptlet> - \n dayListMarkup: - <jsp:scriptlet>/*<![CDATA[*/ - writeMarkupScriptBody(context, component, true); - } - /*]]>*/</jsp:scriptlet> - - <f:call name="writeOptionalFacetMarkupScriptBody"><f:parameter value="optionalHeader" /></f:call> - <f:call name="writeOptionalFacetMarkupScriptBody"><f:parameter value="optionalFooter" /></f:call> - - <f:call name="writeFacetMarkupScriptBody"><f:parameter value="weekDay" /></f:call> - <f:call name="writeFacetMarkupScriptBody"><f:parameter value="weekNumber" /></f:call> - <f:call name="writeFacetMarkupScriptBody"><f:parameter value="header" /></f:call> - <f:call name="writeFacetMarkupScriptBody"><f:parameter value="footer" /></f:call> - }).load( - <jsp:scriptlet>/*<![CDATA[*/ writePreloadBody(context, component); /*]]>*/</jsp:scriptlet> ); Modified: branches/community/3.3.X/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js =================================================================== --- branches/community/3.3.X/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2009-11-23 02:22:47 UTC (rev 15967) +++ branches/community/3.3.X/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2009-11-23 02:30:43 UTC (rev 15968) @@ -17,7 +17,9 @@ this.tempItem; this.BUTTON_WIDTH = 17; //px - + this.BUTTON_LEFT_BORDER = 1; //px + this.BUTTON_RIGHT_BORDER = 1; //px + this.classes = Richfaces.mergeStyles(options.userStyles,new Richfaces.ComboBoxStyles().getCommonStyles()); @@ -115,8 +117,18 @@ }, setInputWidth : function() { - var width = parseInt(this.field.parentNode.style.width) - this.BUTTON_WIDTH; - this.field.style.width = width + "px"; + var width; + if (Richfaces.browser.isIE6) { + width = parseInt(this.field.parentNode.style.width) - this.BUTTON_WIDTH; + } else { + width = parseInt(this.field.parentNode.style.width) + - parseInt(Element.getStyle(this.field, Richfaces.borders.l)) + - parseInt(Element.getStyle(this.field, Richfaces.paddings.l)) + - parseInt(Element.getStyle(this.field, Richfaces.paddings.r)) + - parseInt(Element.getStyle(this.field, Richfaces.borders.r)); + width -= this.buttonBG.offsetWidth ? this.buttonBG.offsetWidth : this.BUTTON_WIDTH; + } + this.field.style.width = width + "px"; }, buttonClickHandler : function(event) { Modified: branches/community/3.3.X/ui/contextMenu/src/main/resources/org/richfaces/renderkit/html/scripts/context-menu.js =================================================================== --- branches/community/3.3.X/ui/contextMenu/src/main/resources/org/richfaces/renderkit/html/scripts/context-menu.js 2009-11-23 02:22:47 UTC (rev 15967) +++ branches/community/3.3.X/ui/contextMenu/src/main/resources/org/richfaces/renderkit/html/scripts/context-menu.js 2009-11-23 02:30:43 UTC (rev 15968) @@ -4,27 +4,40 @@ Richfaces.ContextMenu.prototype = { initialize: function(id, delay, evaluator, options) { - this.options = options || {}; this.id = id; this.element = $(id); + this.element.component = this; this.menuContent = null; + + this.options = options || {}; this.evaluator = evaluator; - this.element.component = this; this["rich:destructor"] = "destroy"; + this.doShow = this.show; this.doHide = this.hide; this.delay = delay; + + this.attachedToElementId = null; + this.attachedTo = []; }, destroy: function() { + for (var elementId in this.attachedTo) { + var element = $(elementId); + if (element) { + var attached = this.attachedTo[elementId]; + Event.stopObserving(element, attached['eventName'], attached['listener']); + } + } + this.enableDefaultContextMenu(); this.element.component = null; this.element = null; this.menuContent = null; + this.attachedTo = []; }, - disableDefaultContextMenu: function (element, id, event, attachedToPerent) - { + disableDefaultContextMenu: function (element, id, event, attachedToPerent) { if (event=="oncontextmenu") { this.attachedToElementId = id; this.attachedToParent = attachedToPerent; @@ -34,9 +47,8 @@ } }, - enableDefaultContextMenu: function () - { - if (this.eventName=="contextmenu" && this.attachedToElementId) { + enableDefaultContextMenu: function () { + if (this.eventName == "contextmenu" && this.attachedToElementIds.length) { var element = $(this.attachedToElementId); if (!element && this.attachedToParent) { element = this.element; @@ -72,18 +84,28 @@ // attach contextMenu to specified element attachToElement : function(element, event, context) { - if (element) { + if (!element) { + return; + } + this.applyDecoration(element); - //Strip 'on' here - var evnName = event.substr(2); + var evnName = event.substr(2); //Strip 'on' here // http://jira.jboss.com/jira/browse/RF-3419 if(evnName == 'contextmenu') { Richfaces.enableDefaultHandler('click'); } + var listener = this.show.bindAsEventListener(this, context); Event.observe(element, evnName, listener); + if (element.id) { + this.attachedTo[element.id] = { + 'eventName' : evnName, + 'listener' : listener + }; } + + }, hide: function() { @@ -140,13 +162,7 @@ }, applyDecoration : function(element) { - $(element).addClassName("rich-cm-attached"); - - /*var f = this.options.applyDecorations; - if (f) { - f(element); - }*/ } }; Property changes on: branches/community/3.3.X/ui/editor ___________________________________________________________________ Name: svn:mergeinfo - Deleted: branches/community/3.3.X/ui/editor/src/test/java/org/richfaces/seamparser/HtmlSeamParserTest.java.cp1251 =================================================================== --- branches/community/3.3.X/ui/editor/src/test/java/org/richfaces/seamparser/HtmlSeamParserTest.java.cp1251 2009-11-23 02:22:47 UTC (rev 15967) +++ branches/community/3.3.X/ui/editor/src/test/java/org/richfaces/seamparser/HtmlSeamParserTest.java.cp1251 2009-11-23 02:30:43 UTC (rev 15968) @@ -1,759 +0,0 @@ -package org.richfaces.seamparser; - -import antlr.RecognitionException; -import antlr.TokenStreamException; -import junit.framework.TestCase; -import org.jboss.seam.text.SeamTextLexer; -import org.jboss.seam.text.SeamTextParser; -import org.richfaces.convert.seamtext.HtmlToSeamSAXParser; - -import java.io.StringReader; - -/** - * @user: akolonitsky - * Date: Mar 25, 2009 - */ -public class HtmlSeamParserTest extends TestCase { - - - private final static String SEAM_TEXT_EXPRESSION_1 = "It's easy to make *emphasis* -1- *emphasis*, |monospace|, " - + "~deleted text~, super^scripts^ or_underlines_."; - - private final static String SEAM_TEXT_EXPRESSION_2 = "+ This is a big heading\n" - + "You /must/ have some text following a heading!\n\n" - + "++ This is a smaller heading\n" - + "This is the first paragraph. We can split it across multiple" - + "lines, but we must end it with a blank line.\n\n" - + "This is the second paragraph."; - - private final static String SEAM_TEXT_EXPRESSION_3 = "An ordered list:\n\n" - + "# first item\n" + "# second item\n" - + "# and even the /third/ item\n\n" + "An unordered list:\n\n" - + "= an item\n" + "= another item"; - - private final static String SEAM_TEXT_EXPRESSION_4 = "The other guy said: " + "\"Nyeah nyeah-nee\""; - - private final static String SEAM_TEXT_EXPRESSION_5 = - "You can write down equations like 2\\*3\\+4-7\\=3 and HTML tagslike \\<body\\> using the escape character: \\\\. foo(a)tut.by, 100$ cash 100%"; - - private final static String SEAM_TEXT_EXPRESSION_6 = "My code doesn't work:" - + "`for (int i=0; i<100; i--)\n" - + "{\n" - + "doSomething(){ String str = \"& >" \"; }; doSomething();\n" - + "doSomething() " + - "}`" + " Any ideas?"; - - private final static String SEAM_TEXT_EXPRESSION_7 = "+ test value<h1>test1<h2>test2</h2>test4</h1>\ntest"; - - private final static String SEAM_TEXT_EXPRESSION_8 = "++ test value<h1>test1<h2>test2</h2>test4</h1>\ntest"; - - private final static String SEAM_TEXT_EXPRESSION_9 = "+++ test value<h1>test1<h2>test2</h2>test4</h1>\ntest"; - - private final static String SEAM_TEXT_EXPRESSION_10 = "++++ test value<h1>test1<h2>test2</h2>test4</h1>\ntest"; - - private final static String SEAM_TEXT_EXPRESSION_11 = "+ test value<div>test5</div><h1>test1<div>test2</div>test4</h1>\ntest"; - - private final static String SEAM_TEXT_EXPRESSION_12 = "[test link=>http://test.com]"; - - private final static String SEAM_TEXT_EXPRESSION_13 = "[=>http://test.com]"; - - private final static String SEAM_TEXT_EXPRESSION_14 = "This is a |<tag attribute=\"value\"/>| example."; - - private final static String SEAM_TEXT_EXPRESSION_15 = "= <div class=\"testClass1 testClass2\"></div><h1> test value </h1>"; - - private final static String SEAM_TEXT_EXPRESSION_16 = "# <div class=\"testClass1 testClass2\"></div><h1> test value </h1>"; - - private final static String SEAM_TEXT_EXPRESSION_17 = "paragraph\n\n+ header\ntext after header\n\nanother paragraph"; - - private final static String SEAM_TEXT_EXPRESSION_18 = "paragraph\n\n++ header\ntext after header\n\nanother paragraph"; - - private final static String SEAM_TEXT_EXPRESSION_19 = "paragraph\n\n+++ header\ntext after header\n\nanother paragraph"; - - private final static String SEAM_TEXT_EXPRESSION_20 = "paragraph\n\n++++ header\ntext after header\n\nanother paragraph"; - - private final static String SEAM_TEXT_EXPRESSION_21 = "paragraph\n\n= item1\n= item2\n= item3\n\nanother paragraph"; - - private final static String SEAM_TEXT_EXPRESSION_22 = "paragraph\n\n# item1\n# item2\n# item3\n\nanother paragraph"; - - private final static String SEAM_TEXT_EXPRESSION_23 = "+ header text *emphasis*, |monospace|, " - + "~deleted text~, super^scripts^ or_underlines_\n text after header *emphasis*, |monospace|, " - + "~deleted text~, super^scripts^ or_underlines_"; - - private final static String SEAM_TEXT_EXPRESSION_24 = "++ header text *emphasis*, |monospace|, " - + "~deleted text~, super^scripts^ or_underlines_\n text after header *emphasis*, |monospace|, " - + "~deleted text~, super^scripts^ or_underlines_"; - - private final static String SEAM_TEXT_EXPRESSION_25 = "+++ header text *emphasis*, |monospace|, " - + "~deleted text~, super^scripts^ or_underlines_\n text after header *emphasis*, |monospace|, " - + "~deleted text~, super^scripts^ or_underlines_"; - - private final static String SEAM_TEXT_EXPRESSION_26 = "++++ header text *emphasis*, |monospace|, " - + "~deleted text~, super^scripts^ or_underlines_\n text after header *emphasis*, |monospace|, " - + "~deleted text~, super^scripts^ or_underlines_"; - - - private final static String SEAM_TEXT_EXPRESSION_27 = "= item1 *emphasis*, |monospace|, " - + "~deleted text~, super^scripts^ or_underlines_\n= item2 *emphasis*, |monospace|, " - + "~deleted text~, super^scripts^ or_underlines_"; - - private final static String SEAM_TEXT_EXPRESSION_28 = "# item1 *emphasis*, |monospace|, " - + "~deleted text~, super^scripts^ or_underlines_\n# item2 *emphasis*, |monospace|, " - + "~deleted text~, super^scripts^ or_underlines_"; - - private final static String SEAM_TEXT_EXPRESSION_29 = "A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9"; - - public HtmlSeamParserTest(String name) { - super(name); - } - - public void testSeamTextConverting1() throws Exception { - assertSeamConverting(SEAM_TEXT_EXPRESSION_1); - } - - public void testStandartSeamTextConverting2() throws Exception { - assertSeamConverting(SEAM_TEXT_EXPRESSION_2); - } - - public void testStandartSeamTextConverting3() throws Exception { - assertSeamConverting(SEAM_TEXT_EXPRESSION_3); - } - - public void testStandartSeamTextConverting4() throws Exception { - assertSeamConverting(SEAM_TEXT_EXPRESSION_4); - } - - public void testStandartSeamTextConverting5() throws Exception { - assertSeamConverting(SEAM_TEXT_EXPRESSION_5); - } - - public void testStandartSeamTextConverting6() throws Exception { - assertSeamConverting(SEAM_TEXT_EXPRESSION_6); - } - - public void testStandartSeamTextConverting7() throws Exception { - assertSeamConverting(SEAM_TEXT_EXPRESSION_7); - } - - public void testStandartSeamTextConverting8() throws Exception { - assertSeamConverting(SEAM_TEXT_EXPRESSION_8); - } - - public void testStandartSeamTextConverting9() throws Exception { - assertSeamConverting(SEAM_TEXT_EXPRESSION_9); - } - - public void testStandartSeamTextConverting10() throws Exception { - assertSeamConverting(SEAM_TEXT_EXPRESSION_10); - } - - public void testStandartSeamTextConverting11() throws Exception { - assertSeamConverting(SEAM_TEXT_EXPRESSION_11); - } - - public void testStandartSeamTextConverting12() throws Exception { - assertSeamConverting(SEAM_TEXT_EXPRESSION_12); - } - - public void testStandartSeamTextConverting13() throws Exception { - assertSeamConverting(SEAM_TEXT_EXPRESSION_13); - } - - public void testStandartSeamTextConverting14() throws Exception { - assertSeamConverting(SEAM_TEXT_EXPRESSION_14); - } - - public void testStandartSeamTextConverting15() throws Exception { - assertSeamConverting(SEAM_TEXT_EXPRESSION_15); - } - - public void testStandartSeamTextConverting16() throws Exception { - assertSeamConverting(SEAM_TEXT_EXPRESSION_16); - } - - public void testStandartSeamTextConverting17() throws Exception { - assertSeamConverting(SEAM_TEXT_EXPRESSION_17); - } - - - public void testStandartSeamTextConverting18() throws Exception { - assertSeamConverting(SEAM_TEXT_EXPRESSION_18); - } - - public void testStandartSeamTextConverting19() throws Exception { - assertSeamConverting(SEAM_TEXT_EXPRESSION_19); - } - - public void testStandartSeamTextConverting20() throws Exception { - assertSeamConverting(SEAM_TEXT_EXPRESSION_20); - } - - public void testStandartSeamTextConverting21() throws Exception { - assertSeamConverting(SEAM_TEXT_EXPRESSION_21); - } - - public void testStandartSeamTextConverting22() throws Exception { - assertSeamConverting(SEAM_TEXT_EXPRESSION_22); - } - - public void testStandartSeamTextConverting23() throws Exception { - assertSeamConverting(SEAM_TEXT_EXPRESSION_23); - } - - public void testStandartSeamTextConverting24() throws Exception { - assertSeamConverting(SEAM_TEXT_EXPRESSION_24); - } - - public void testStandartSeamTextConverting25() throws Exception { - assertSeamConverting(SEAM_TEXT_EXPRESSION_25); - } - - public void testStandartSeamTextConverting26() throws Exception { - assertSeamConverting(SEAM_TEXT_EXPRESSION_26); - } - - public void testStandartSeamTextConverting27() throws Exception { - assertSeamConverting(SEAM_TEXT_EXPRESSION_27); - } - - public void testStandartSeamTextConverting28() throws Exception { - assertSeamConverting(SEAM_TEXT_EXPRESSION_28); - } - - public void testStandartSeamTextConverting29() throws Exception { - assertSeamConverting(SEAM_TEXT_EXPRESSION_29); - } - - public void testRF5717() throws Exception { - assertHtml2SeamConverting("<p>a<b a&b</p>"); - } - - public void testNestingFormating() throws Exception { - assertHtml2SeamConverting("<p><b>aaaaaaaaa <u><i class=\"seamTextEmphasis\">sssssssss</i> dddddddddddddddd</u></b></p>"); - } - - public void testNestingFormating1() throws Exception { - assertHtml2SeamConverting("<P><STRONG>aaaaaaaaad <U><B>ddddddddddddd</B> sssssssssssss</U></STRONG></P>"); - } - - public void testSkipComment() throws Exception { - assertHtml2SeamConverting(""); - } - - public void testUglyTextFromWord() throws Exception { - final String str = "<p><meta content=\"text/html; charset=utf-8\" http-equiv=\"Content-Type\"/><meta content=\"Word.Document\" name=\"ProgId\"/><meta content=\"Microsoft Word 12\" name=\"Generator\"/><meta content=\"Microsoft Word 12\" name=\"Originator\"/><link href=\"file:///E:\\TEMP~1\\msohtmlclip1\\01\\clip_filelist.xml\" rel=\"File-List\"/><link href=\"file:///E:\\TEMP~1\\msohtmlclip1\\01\\clip_themedata.thmx\" rel=\"themeData\"/><link href=\"file:///E:\\TEMP~1\\msohtmlclip1\\01\\clip_colorschememapping.xml\" rel=\"colorSchemeMapping\"/>" + - "" + - "" + - "<style>\n" + - "\n" + - "</style>" + - "\n" + - "\n" + - "<p align=\"center\" style=\"margin-bottom: 0.0001pt; text-align: center;\"><a name=\"OLE_LINK2\"/><a name=\"OLE_LINK1\"><span style=\"\"><b><span style='font-size: 20pt; font-family: \"Courier New\"; color: black;'>We where\n" + - "unsuccessful in reproducting this bug in our testing</span></b></span></a></p>\n" + - "\n" + - "<p align=\"center\" style=\"margin-bottom: 0.0001pt; text-align: center;\"><span style=\"\"><span style=\"\"><b><span style='font-size: 20pt; font-family: \"Courier New\"; color: black;'>environment.</span></b></span></span></p>\n" + - "\n" + - "<p style=\"margin-bottom: 0.0001pt;\"><span style=\"\"><span style=\"\"><o:p>A�</o:p></span></span></p>\n" + - "\n" + - "<p style=\"margin-bottom: 0.0001pt;\"><span style=\"\"><span style=\"\"><s><span style='font-size: 13pt; font-family: \"Courier New\"; color: black;'>Could you provide us with a example URL\n" + - "where this is happening?</span></s></span></span></p>\n" + - "\n" + - "<p style=\"margin-bottom: 0.0001pt;\"><span style=\"\"><span style=\"\"><span style='font-size: 13pt; font-family: \"Courier New\"; color: black;'>Do you have any odd browser\n" + - "extensions/plugins installed?</span></span></span></p>\n" + - "\n" + - "<p style=\"margin-bottom: 0.0001pt;\"><span style=\"\"><span style=\"\"><span style='font-size: 13pt; font-family: \"Courier New\"; color: black;'>Does it happen on our site aswell </span></span></span><a href=\"http://tinymce.moxiecode.com/\"><span style=\"\"><span style=\"\"><span style='font-size: 13pt; font-family: \"Courier New\";'>http://tinymce.moxiecode.com</span></span></span></a><span style=\"\"><span style=\"\"><span style='font-size: 13pt; font-family: \"Courier New\"; color: black;'>?</span></span></span></p>\n" + - "\n" + - "<p style=\"margin-bottom: 0.0001pt;\"><span style=\"\"><span style=\"\"><o:p>A�</o:p></span></span></p>\n" + - "\n" + - "<span style=\"\"/><span style=\"\"/>\n" + - "\n" + - "<p class=\"MsoNormal\"><o:p>A�</o:p></p>\n" + - "\n" + - "</p>"; - assertHtml2SeamConverting(str); - } - - public void testTextFromOpenOffice() throws Exception { - assertHtml2SeamConverting( - "<p style=\"margin-bottom: 0in; line-height: 100%;\" >" + - " <meta http-equiv=\"CONTENT-TYPE\" content=\"text/html;\" charset=\"utf-8\" />" + - " <title></title>" + - " <meta name=\"GENERATOR\" content=\"OpenOffice.org 3.0 (Win32)\" />" + - " <style type=\"text/css\"></style>" + - "</p>" + - "<p style=\"margin-bottom: 0in; line-height: 100%;\" " + - " align=\"center\" " + - " lang=\"en-US\">" + - " <font color=\"#000000\">" + - " <font color=\"#000001\">" + - " <font color=\"#000002\" style=\"font-size: 20pt;\" size=\"5\">" + - " <b>We where unsuccessful in reproducting this bug in our testing</b>" + - " </font>" + - " </font>" + - " </font>" + - "</p>" + - "<p style=\"margin-bottom: 0in; line-height: 100%;\" " + - " align=\"center\" " + - " lang=\"en-US\">" + - " <font color=\"#000000\">" + - " <font>" + - " <font style=\"font-size: 20pt;\" size=\"5\">" + - " <b>environment.</b>" + - " </font>" + - " </font>" + - " </font>" + - "</p>"); - } - - private String assertHtml2SeamConverting(String htmlText) - throws Exception { - - final String seamText = convertHtmlToSeamText(htmlText); - System.out.println("seamText = \n" + seamText); - - final SeamTextParser seamParser = new SeamTextParser( - new SeamTextLexer(new StringReader(seamText))); - seamParser.startRule(); - - return seamParser.toString(); - } - - private void assertSeamConverting(String seamTextExpression) throws TokenStreamException, RecognitionException { - - final SeamTextParser seamParser = new SeamTextParser(new SeamTextLexer(new StringReader(seamTextExpression))); - seamParser.startRule(); - final String html = seamParser.toString(); - System.out.println("html = " + html); - - final String seamtext = convertHtmlToSeamText(html); - - assertEquals(seamTextExpression,seamtext.trim()); - } - - private String convertHtmlToSeamText(final String html) { - try { - return HtmlToSeamSAXParser.convertHtmlToSeamText(html); - } catch (Exception e) { - e.printStackTrace(); - assertTrue(false); - } - - return null; - } -} \ No newline at end of file Modified: branches/community/3.3.X/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/css/slider.xcss =================================================================== --- branches/community/3.3.X/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/css/slider.xcss 2009-11-23 02:22:47 UTC (rev 15967) +++ branches/community/3.3.X/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/css/slider.xcss 2009-11-23 02:30:43 UTC (rev 15968) @@ -99,6 +99,17 @@ text-align : center; z-index : 1; } + +.rich-inslider-handler-selected-vertical{ + background-color : transparent; + width : 7px; + height : 8px; + font-size : 1px; + position : absolute; + text-align : center; + z-index : 1; +} + .rich-inslider-track{ background-position: left top; background-repeat: repeat-x; Modified: branches/community/3.3.X/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js =================================================================== --- branches/community/3.3.X/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js 2009-11-23 02:22:47 UTC (rev 15967) +++ branches/community/3.3.X/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js 2009-11-23 02:30:43 UTC (rev 15968) @@ -24,11 +24,11 @@ }; Object.extend(defaultOptions, options); this.handle = $( id + "Handle" ); - this.tip = $( id + "Tip" ); - this.track = $( id + "Track" ); - this.mainTable = $( id ); + this.tip = $( id + "Tip" ); + this.track = $( id + "Track" ); + this.mainTable = $( id ); var inputId = id + "Input"; - this.input = $(inputId) || document.getElementsByName(inputId)[0]; + this.input = $(inputId) || document.getElementsByName(inputId)[0]; if(defaultOptions.showArrows){ var arrowIncId = id + "ArrowInc"; this.arrowInc = $(arrowIncId) || document.getElementsByName(arrowIncId)[0]; @@ -57,9 +57,9 @@ this.classes.arrowSelected = "rich-inslider-handler-selected-vertical"; this.classes.base = " " + this.trim(this.classes.temp.replace("rich-inslider-handler-vertical","")); } - - this.classes.handleSelected = " " + defaultOptions.handleSelectedClass; + this.classes.handleSelected = defaultOptions.handleSelectedClass ? " " + defaultOptions.handleSelectedClass : ""; + this.table = this.findTableForTrack(this.track); this.input.value = this.options.sliderValue; @@ -356,10 +356,12 @@ }, startDrag: function(event) { - if (this.editInFocus) + if (this.editInFocus) { this.input.blur(); - window.document.onmouseup = this.eventMouseUp.bindAsEventListener(this); - window.document.onmousemove = this.eventMouseMove.bindAsEventListener(this); + } + + window.document.onmouseup = this.eventMouseUp.bindAsEventListener(this); + window.document.onmousemove = this.eventMouseMove.bindAsEventListener(this); Event.observe(document, "mouseout", this.eventWindowMouseOut); this.editBlur(); this.prevMouseDownEvent = event; @@ -381,7 +383,7 @@ } else { pointer = Event.pointerX(event); } - var offsets = Position.cumulativeOffset(this.track); + var offsets = Position.cumulativeOffset(this.track); this.updating = true; var value; Modified: branches/community/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java =================================================================== --- branches/community/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2009-11-23 02:22:47 UTC (rev 15967) +++ branches/community/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2009-11-23 02:30:43 UTC (rev 15968) @@ -49,6 +49,7 @@ import org.richfaces.component.UIMenuItem; import org.richfaces.component.util.ViewUtil; import org.richfaces.renderkit.CompositeRenderer; +import org.richfaces.json.JSONObject; public class MenuItemRendererBase extends CompositeRenderer { @@ -354,4 +355,8 @@ ComponentsVariableResolver.getVariables(this, menuItem); delegate.initializeStyles(context, menuItem, menuItem.isDisabled(), variables); } + + public static String toJson(Map map) { + return new JSONObject(map).toString(); + } } Modified: branches/community/3.3.X/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js =================================================================== --- branches/community/3.3.X/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js 2009-11-23 02:22:47 UTC (rev 15967) +++ branches/community/3.3.X/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js 2009-11-23 02:30:43 UTC (rev 15968) @@ -19,14 +19,14 @@ } //layer.style.height = dims.height + "px"; } // if -} +}; RichFaces.Menu.removePx = function(e) { if ((e+"").indexOf("px")!=-1) return (e+"").substring(0,e.length-2); else return e; -} +}; RichFaces.Menu.Layers = { listl: new Array(), @@ -113,7 +113,7 @@ }, isVisible: function(layer) { - return ($(layer).style.display != 'none'); + return $(layer).style.display != 'none'; }, /** @@ -121,11 +121,11 @@ * @param visibleFlag */ LMPopUpL: function(menuName, visibleFlag, event) { - if (!this.loaded) { + var menu = $(menuName); + if (!this.loaded || !menu) { return; } this.detectWidth(); - var menu = $(menuName); var eventResult = true; RichFaces.Menu.fitLayerToContent(menu); @@ -1313,7 +1313,7 @@ var label = typeof element.getLabel == 'fuction' ? element.getLabel() : RichFaces.Menu.Utils.getLabel(element); Element.removeClassName(label, 'rich-menu-item-label-selected'); -} +}; RichFaces.Menu.Utils.itemMouseOver = function(event, element, parentClasses, itemClasses) { @@ -1328,15 +1328,15 @@ var label = typeof element.getLabel == 'fuction' ? element.getLabel() : RichFaces.Menu.Utils.getLabel(element); Element.addClassName(label, 'rich-menu-item-label-selected'); -} +}; RichFaces.Menu.Utils.getIcon = function (element) { return $(element.id + ':icon'); -} +}; RichFaces.Menu.Utils.getLabel = function (element) { return $(element.id + ':anchor'); -} +}; RichFaces.Menu.Item = Class.create({ initialize: function(id, menu, options) { @@ -1532,7 +1532,7 @@ if (menuItem) break; } return menuItem; -} +}; RichFaces.Menu.updateItem = function (event, element, attr) { var menuItem = RichFaces.Menu.findMenuItem(element.id); @@ -1546,7 +1546,7 @@ element.className = classes; if (attr.onselect) attr.onselect(event); } -} +}; RichFaces.Menu.submitForm = function (event, element, options) { if (!options) { @@ -1562,7 +1562,7 @@ params[element.id+':hidden'] = element.id; Richfaces.jsFormSubmit(element.id, form.id, target, params); return false; -} +}; RichFaces.Menu.groupMouseOut = function(event, element, menuGroupClass, menuGroupStyle) { if (RichFaces.Menu.isWithin(event, element)) { @@ -1571,7 +1571,8 @@ element.className = 'rich-menu-group rich-menu-group-enabled ' + (menuGroupClass ? menuGroupClass : ''); element.style.cssText = menuGroupStyle; -} +}; + RichFaces.Menu.groupMouseOver = function(event, element, menuGroupHoverClass, menuGroupStyle) { if (RichFaces.Menu.isWithin(event, element)) { return; @@ -1579,5 +1580,5 @@ element.className = 'rich-menu-group rich-menu-group-enabled ' + (menuGroupHoverClass ? menuGroupHoverClass : ''); element.style.cssText = menuGroupStyle; -} +}; Modified: branches/community/3.3.X/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx =================================================================== --- branches/community/3.3.X/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx 2009-11-23 02:22:47 UTC (rev 15967) +++ branches/community/3.3.X/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx 2009-11-23 02:30:43 UTC (rev 15968) @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <f:root xmlns:f="http://ajax4jsf.org/cdk/template" - xmlns:c=" http://java.sun.com/jsf/core" - xmlns:ui=" http://ajax4jsf.org/cdk/ui" - xmlns:u=" http://ajax4jsf.org/cdk/u" - xmlns:x=" http://ajax4jsf.org/cdk/x" + xmlns:c="http://java.sun.com/jsf/core" + xmlns:ui="http://ajax4jsf.org/cdk/ui" + xmlns:u="http://ajax4jsf.org/cdk/u" + xmlns:x="http://ajax4jsf.org/cdk/x" baseclass="org.richfaces.renderkit.html.MenuItemRendererBase" class="org.richfaces.renderkit.html.MenuItemRenderer" component="org.richfaces.component.UIMenuItem" @@ -82,8 +82,8 @@ <div id="#{clientId}" class="#{menuItemClass}" - onmouseout="RichFaces.Menu.Utils.itemMouseOut(event, this, #{onmouseoutClasses});" - onmouseover="RichFaces.Menu.Utils.itemMouseOver(event, this, #{onmouseoverClasses});" + onmouseout="RichFaces.Menu.Utils.itemMouseOut(event, this, #{this:toJson(onmouseoutClasses)});" + onmouseover="RichFaces.Menu.Utils.itemMouseOver(event, this, #{this:toJson(onmouseoverClasses)});" onclick="#{onclick}" style="#{menuItemStyle}"> <f:call name="utils.encodeAttributes">

15 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r15967 - in branches/community/3.3.X/samples/richfaces-demo/src/main/webapp: richfaces and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2009-11-22 21:22:47 -0500 (Sun, 22 Nov 2009) New Revision: 15967 Modified: branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/templates/include/components-group.xhtml Log: Examples: merged from 3.3.x_jsf2 branch Modified: branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml 2009-11-23 02:18:12 UTC (rev 15966) +++ branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml 2009-11-23 02:22:47 UTC (rev 15967) @@ -60,7 +60,12 @@ <param-name>org.richfaces.LoadScriptStrategy</param-name> <param-value>ALL</param-value> </context-param> + <context-param> + <param-name>javax.faces.DISABLE_FACELET_JSF_VIEWHANDLER</param-name> + <param-value>true</param-value> + </context-param> + <listener> <listener-class> org.jboss.seam.servlet.SeamListener Modified: branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml 2009-11-23 02:18:12 UTC (rev 15966) +++ branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml 2009-11-23 02:22:47 UTC (rev 15967) @@ -15,7 +15,7 @@ <rich:tab label="Extended Data Model" name="dataModel"> <ui:include src="/richfaces/dataTable/extended-data-model.xhtml"/> </rich:tab> - <rich:tab label="Modifiable Data Model" name="modifiableDataModel"> + <rich:tab actionListener="#{conversation.start()}" label="Modifiable Data Model" name="modifiableDataModel"> <ui:include src="/richfaces/dataTable/modifiableModel.xhtml"/> </rich:tab> <rich:tab label="Edit Table with ModalPanel" name="editDataTable"> Modified: branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/templates/include/components-group.xhtml =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/templates/include/components-group.xhtml 2009-11-23 02:18:12 UTC (rev 15966) +++ branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/templates/include/components-group.xhtml 2009-11-23 02:22:47 UTC (rev 15967) @@ -7,16 +7,16 @@ <ui:composition> <table border="0" cellpadding="0" cellspacing="1"> <tbody> - <a4j:repeat var="component" value="#{components}"> - <tr class="#{component.current?'active':'unactive'}" onmouseover="this.className='active'" onmouseout="this.className='#{component.current?'active':'unactive'}'"> - <td class="ico"><div style="width: 16px;height: 16px;"><h:graphicImage value="#{component.iconImage}" width="16" height="16" alt="" border="0" /><h:graphicImage value="/images/icons/ico_new_item.gif" rendered="#{component.newComponent}" style="position:relative; top:-6px; left:10px;" alt="" width="10" height="10"/></div></td> - <td class="text #{component.newComponent?'bold':''}" width="100%"> - <h:outputLink style="display:block;height:20px" value="#{component.contextRelativeDemoLocation}"> + <a4j:repeat var="component2" value="#{components}"> + <tr class="#{component2.current?'active':'unactive'}" onmouseover="this.className='active'" onmouseout="this.className='#{component2.current?'active':'unactive'}'"> + <td class="ico"><div style="width: 16px;height: 16px;"><h:graphicImage value="#{component2.iconImage}" width="16" height="16" alt="" border="0" /><h:graphicImage value="/images/icons/ico_new_item.gif" rendered="#{component2.newComponent}" style="position:relative; top:-6px; left:10px;" alt="" width="10" height="10"/></div></td> + <td class="text #{component2.newComponent?'bold':''}" width="100%"> + <h:outputLink style="display:block;height:20px" value="#{component2.contextRelativeDemoLocation}"> <span style="display:block;padding-top:3px;text-decoration : none; color : #000000;"> - #{component.name} + #{component2.name} </span> - <f:param value="#{component.id}" name="c"/> - <f:param value="#{component.activeTab}" name="tab"/> + <f:param value="#{component2.id}" name="c"/> + <f:param value="#{component2.activeTab}" name="tab"/> </h:outputLink> </td> </tr>

15 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r15966 - in branches/community/3.3.X/samples: colorPickerDemo and 2 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2009-11-22 21:18:12 -0500 (Sun, 22 Nov 2009) New Revision: 15966 Modified: branches/community/3.3.X/samples/colorPickerDemo/pom.xml branches/community/3.3.X/samples/layout-sample/pom.xml branches/community/3.3.X/samples/pom.xml branches/community/3.3.X/samples/richfaces-demo/pom.xml Log: Examples: merged from 3.3.x_jsf2 branch Modified: branches/community/3.3.X/samples/colorPickerDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/colorPickerDemo/pom.xml 2009-11-23 01:53:43 UTC (rev 15965) +++ branches/community/3.3.X/samples/colorPickerDemo/pom.xml 2009-11-23 02:18:12 UTC (rev 15966) @@ -32,12 +32,6 @@ </dependency> <dependency> - <groupId>org.richfaces.framework - </groupId> - <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> - </dependency> - <dependency> <groupId>org.richfaces.samples </groupId> <artifactId>skins</artifactId> Modified: branches/community/3.3.X/samples/layout-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/layout-sample/pom.xml 2009-11-23 01:53:43 UTC (rev 15965) +++ branches/community/3.3.X/samples/layout-sample/pom.xml 2009-11-23 02:18:12 UTC (rev 15966) @@ -32,11 +32,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> - </dependency> - <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> <version>3.3.3-SNAPSHOT</version> Modified: branches/community/3.3.X/samples/pom.xml =================================================================== --- branches/community/3.3.X/samples/pom.xml 2009-11-23 01:53:43 UTC (rev 15965) +++ branches/community/3.3.X/samples/pom.xml 2009-11-23 02:18:12 UTC (rev 15966) @@ -64,11 +64,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>com.sun.facelets</groupId> <artifactId>jsf-facelets</artifactId> <version>1.1.14</version> @@ -116,6 +111,11 @@ </build> <dependencies> <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> <version>1.0</version> @@ -169,6 +169,11 @@ </build> <dependencies> <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.5</version> @@ -190,7 +195,55 @@ <artifactId>jsf-impl</artifactId> <version>1.2_12</version> <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>jsf2_0</id> + <build> + <defaultGoal>jetty:run</defaultGoal> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>${project.version}</version> + <classifier>jsf2</classifier> </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>2.0.1</version> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>2.0.1</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.1</version> + <scope>provided</scope> + </dependency> </dependencies> </profile> <profile> @@ -235,17 +288,6 @@ <version>2.0</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2_12</version> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>1.2_12</version> - <scope>runtime</scope> - </dependency> </dependencies> </profile> <profile> @@ -281,17 +323,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2_12</version> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>1.2_12</version> - <scope>runtime</scope> - </dependency> - <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> <version>1.0</version> @@ -334,18 +365,6 @@ <version>2.0</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>1.2_12</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2_12</version> - <scope>provided</scope> - </dependency> </dependencies> </profile> <profile> Modified: branches/community/3.3.X/samples/richfaces-demo/pom.xml =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/pom.xml 2009-11-23 01:53:43 UTC (rev 15965) +++ branches/community/3.3.X/samples/richfaces-demo/pom.xml 2009-11-23 02:18:12 UTC (rev 15966) @@ -194,12 +194,39 @@ </dependency> </dependencies> </profile> + <profile> + <id>jsf2_0</id> + <dependencies> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>2.0.1</version> + <exclusions> + <exclusion> + <artifactId>javax.el</artifactId> + <groupId>el-api</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>2.0.1</version> + <exclusions> + <exclusion> + <artifactId>javax.el</artifactId> + <groupId>el-api</groupId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + </profile> </profiles> <dependencies> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-validator</artifactId> - <version>3.1.0.CR1</version> + <version>3.1.0.GA</version> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -297,7 +324,7 @@ <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam</artifactId> - <version>2.1.0.SP1</version> + <version>2.2.0.GA</version> <exclusions> <exclusion> <groupId>org.richfaces.framework</groupId> @@ -356,7 +383,7 @@ <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-ui</artifactId> - <version>2.1.0.SP1</version> + <version>2.2.0.GA</version> <exclusions> <exclusion> <artifactId>jsf-api</artifactId> @@ -371,7 +398,7 @@ <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-debug</artifactId> - <version>2.1.0.SP1</version> + <version>2.2.0.GA</version> <exclusions> <exclusion> <artifactId>jsf-api</artifactId> @@ -397,19 +424,12 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-annotations</artifactId> - <version>3.3.0.ga</version> + <version>3.4.0.GA</version> </dependency> <dependency> <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - <version>3.2.6.ga</version> - - <exclusions> - <exclusion> - <artifactId>commons-collections</artifactId> - <groupId>commons-collections</groupId> - </exclusion> - </exclusions> + <artifactId>hibernate-core</artifactId> + <version>3.3.2.GA</version> </dependency> </dependencies> </project>

15 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r15965 - in branches/community/3.3.X/ui: columns/src/main/config/component and 13 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2009-11-22 20:53:43 -0500 (Sun, 22 Nov 2009) New Revision: 15965 Removed: branches/community/3.3.X/ui/columns/src/test/java/org/richfaces/jsp/tag/DataTableTagMock.java Modified: branches/community/3.3.X/ui/beanValidator/src/test/java/org/richfaces/component/BeanValidatorComponentTest.java branches/community/3.3.X/ui/beanValidator/src/test/java/org/richfaces/component/GraphValidatorComponentTest.java branches/community/3.3.X/ui/columns/src/main/config/component/columns.xml branches/community/3.3.X/ui/columns/src/test/java/org/richfaces/jsp/tag/ColumnsJspTagTest.java branches/community/3.3.X/ui/componentControl/src/test/java/org/richfaces/component/ComponentControlTest.java branches/community/3.3.X/ui/contextMenu/src/test/java/org/richfaces/component/ContextMenuComponentTest.java branches/community/3.3.X/ui/core/src/test/java/org/ajax4jsf/component/QueueRendererTest.java branches/community/3.3.X/ui/core/src/test/java/org/ajax4jsf/component/UIAjaxFormTest.java branches/community/3.3.X/ui/core/src/test/resources/org/ajax4jsf/component/queue-ajax-form.xhtml branches/community/3.3.X/ui/hotKey/src/test/java/org/richfaces/component/HotKeyComponentTest.java branches/community/3.3.X/ui/message/src/test/java/org/richfaces/renderer/RichMessageRendererTest.java branches/community/3.3.X/ui/message/src/test/java/org/richfaces/renderer/RichMessagesRendererTest.java branches/community/3.3.X/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java branches/community/3.3.X/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java branches/community/3.3.X/ui/suggestionbox/src/test/java/org/richfaces/component/SuggestionBoxComponentTest.java branches/community/3.3.X/ui/toolBar/src/test/java/org/richfaces/component/ToolBarComponentTest.java branches/community/3.3.X/ui/tooltip/src/test/java/org/richfaces/renderkit/html/ToolTipRendererTest.java branches/community/3.3.X/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java Log: UI: merged from 3.3.x_jsf2 branch Modified: branches/community/3.3.X/ui/beanValidator/src/test/java/org/richfaces/component/BeanValidatorComponentTest.java =================================================================== --- branches/community/3.3.X/ui/beanValidator/src/test/java/org/richfaces/component/BeanValidatorComponentTest.java 2009-11-23 01:42:31 UTC (rev 15964) +++ branches/community/3.3.X/ui/beanValidator/src/test/java/org/richfaces/component/BeanValidatorComponentTest.java 2009-11-23 01:53:43 UTC (rev 15965) @@ -63,6 +63,7 @@ form.setId("form"); facesContext.getViewRoot().getChildren().add(form); input = (HtmlInputText)application.createComponent(HtmlInputText.COMPONENT_TYPE); + input.getAttributes().put("onchange", "return true;"); validator = (UIAjaxValidator)application.createComponent(UIAjaxValidator.COMPONENT_TYPE); validator.setId("validator"); Modified: branches/community/3.3.X/ui/beanValidator/src/test/java/org/richfaces/component/GraphValidatorComponentTest.java =================================================================== --- branches/community/3.3.X/ui/beanValidator/src/test/java/org/richfaces/component/GraphValidatorComponentTest.java 2009-11-23 01:42:31 UTC (rev 15964) +++ branches/community/3.3.X/ui/beanValidator/src/test/java/org/richfaces/component/GraphValidatorComponentTest.java 2009-11-23 01:53:43 UTC (rev 15965) @@ -51,6 +51,7 @@ validator.setId("validator"); input = (UIInput) application.createComponent(UIInput.COMPONENT_TYPE); input.setId("input"); + input.getAttributes().put("onchange", "return true;"); validator.getChildren().add(input); form.getChildren().add(validator); messages = (UIMessages) application Modified: branches/community/3.3.X/ui/columns/src/main/config/component/columns.xml =================================================================== --- branches/community/3.3.X/ui/columns/src/main/config/component/columns.xml 2009-11-23 01:42:31 UTC (rev 15964) +++ branches/community/3.3.X/ui/columns/src/main/config/component/columns.xml 2009-11-23 01:53:43 UTC (rev 15965) @@ -17,7 +17,6 @@ <classname> org.richfaces.taglib.ColumnsTag </classname> - <test/> </tag> <taghandler generate="false"> <classname>org.richfaces.taglib.ColumnsHandler</classname> Modified: branches/community/3.3.X/ui/columns/src/test/java/org/richfaces/jsp/tag/ColumnsJspTagTest.java =================================================================== --- branches/community/3.3.X/ui/columns/src/test/java/org/richfaces/jsp/tag/ColumnsJspTagTest.java 2009-11-23 01:42:31 UTC (rev 15964) +++ branches/community/3.3.X/ui/columns/src/test/java/org/richfaces/jsp/tag/ColumnsJspTagTest.java 2009-11-23 01:53:43 UTC (rev 15965) @@ -34,177 +34,170 @@ import javax.el.ValueExpression; import javax.faces.component.UIComponent; import javax.faces.webapp.UIComponentClassicTagBase; +import javax.servlet.jsp.JspException; +import org.ajax4jsf.tests.AbstractJspTestCase; import org.ajax4jsf.tests.MockPageContext; import org.ajax4jsf.tests.MockValueExpression; -import org.apache.shale.test.base.AbstractJsfTestCase; import org.richfaces.component.UIColumn; +import org.richfaces.component.UIDataTable; import org.richfaces.component.html.HtmlDataTable; import org.richfaces.taglib.ColumnsTag; +import org.richfaces.taglib.DataTableTag; /** * Test class for JSP columns tag * * @author Andrey Markavtsov - * + * @author Nick Belaevski */ -public class ColumnsJspTagTest extends AbstractJsfTestCase { +public class ColumnsJspTagTest extends AbstractJspTestCase { - /** Jsp tag to be tested */ - private ColumnsTag tag; + /** Jsp tag to be tested */ + private ColumnsTag tag; - /** Columns count to be created */ - private int columnsCount; + private DataTableTag parentTag; - /** Key to store executed tags */ - private static final String COMPONENT_TAG_STACK_ATTR = "javax.faces.webapp.COMPONENT_TAG_STACK"; + private UIDataTable dataTable; - /** - * TODO Description goes here. - * - * @param name - */ - public ColumnsJspTagTest(String name) { - super(name); - // TODO Auto-generated constructor stub - } + /** Columns count to be created */ + private int columnsCount; - /** - * Creates value expression - * - * @param o - - * object to be returned by this expression - * @param el - - * ELContext - * @return - created value expression - */ - private ValueExpression getValueExpression(Object o, ELContext el) { - ValueExpression exp = new MockValueExpression(o); - return exp; - } + /** + * TODO Description goes here. + * + * @param name + */ + public ColumnsJspTagTest(String name) { + super(name); + // TODO Auto-generated constructor stub + } - /** - * Inits parent tag contained Data Table component - */ - private void initParentTag() { - - HtmlDataTable dataTable = new HtmlDataTable(); - DataTableTagMock mock = new DataTableTagMock(dataTable); - mock.setPageContext(new MockPageContext()); - List<UIComponentClassicTagBase> list = new ArrayList<UIComponentClassicTagBase>(); - list.add(mock); - - facesContext.getExternalContext().getRequestMap().put( - COMPONENT_TAG_STACK_ATTR, list); - } - - /** - * Gets table from context - * - * @return - */ - private UIComponent getTable() { - List list = (List) facesContext.getExternalContext().getRequestMap() - .get(COMPONENT_TAG_STACK_ATTR); - if (list != null) { - return ((UIComponentClassicTagBase) list.get(list.size() - 1)) - .getComponentInstance(); + /** + * Creates value expression + * + * @param o + * - object to be returned by this expression + * @param el + * - ELContext + * @return - created value expression + */ + private ValueExpression getValueExpression(Object o, ELContext el) { + ValueExpression exp = new MockValueExpression(o); + return exp; } - return null; - } - private void initTag() { - ELContext el = facesContext.getELContext(); - ValueExpression expr = null; + /** + * Inits parent tag contained Data Table component + * + * @throws JspException + */ + private void initParentTag() throws JspException { - // begin - expr = getValueExpression(0, el); - tag.setBegin(expr); - - // value - List<String> list = new ArrayList<String>(); - columnsCount = (int) Math.random() * 10; - if (columnsCount == 0) - columnsCount = 1; - for (int i = 0; i < columnsCount; i++) { - list.add(Integer.toString(i)); + dataTable = new HtmlDataTable(); + parentTag = new DataTableTag(); + parentTag.setBinding(application.getExpressionFactory() + .createValueExpression(dataTable, UIComponent.class)); + parentTag.setPageContext(new MockPageContext()); + List<UIComponentClassicTagBase> list = new ArrayList<UIComponentClassicTagBase>(); + list.add(parentTag); } - expr = getValueExpression(list, el); - tag.setValue(expr); - // style - expr = getValueExpression("color: Blue;", el); - tag.setStyle(expr); + private void initTag() { + ELContext el = facesContext.getELContext(); + ValueExpression expr = null; - // var - expr = getValueExpression("var", el); - tag.setVar(expr); + // begin + expr = getValueExpression(0, el); + tag.setBegin(expr); - // width - expr = getValueExpression("100px;", el); - tag.setWidth(expr); + // value + List<String> list = new ArrayList<String>(); + columnsCount = (int) Math.random() * 10; + if (columnsCount == 0) + columnsCount = 1; + for (int i = 0; i < columnsCount; i++) { + list.add(Integer.toString(i)); + } + expr = getValueExpression(list, el); + tag.setValue(expr); - // index - expr = getValueExpression("counter", el); - tag.setIndex(expr); + // style + expr = getValueExpression("color: Blue;", el); + tag.setStyle(expr); - MockPageContext pageContext = new MockPageContext(); - tag.setPageContext(pageContext); + // var + expr = getValueExpression("var", el); + tag.setVar(expr); - } + // width + expr = getValueExpression("100px;", el); + tag.setWidth(expr); - /* - * (non-Javadoc) - * - * @see junit.framework.TestCase#setUp() - */ - @Override - protected void setUp() throws Exception { - super.setUp(); + // index + expr = getValueExpression("counter", el); + tag.setIndex(expr); - facesContext.getApplication().addComponent("org.richfaces.Column", - "org.richfaces.component.html.HtmlColumn"); + MockPageContext pageContext = new MockPageContext(); + tag.setPageContext(pageContext); - tag = new ColumnsTag(); - initTag(); - initParentTag(); + } - } + /* + * (non-Javadoc) + * + * @see junit.framework.TestCase#setUp() + */ + @Override + public void setUp() throws Exception { + super.setUp(); - /* - * (non-Javadoc) - * - * @see junit.framework.TestCase#tearDown() - */ - @Override - protected void tearDown() throws Exception { - // TODO Auto-generated method stub - super.tearDown(); - this.tag = null; - this.columnsCount = 0; - } + facesContext.getApplication().addComponent("org.richfaces.Column", + "org.richfaces.component.html.HtmlColumn"); - /** - * Tests JSP columns tag - * - * @throws Exception - */ - public void testJspTag() throws Exception { - tag.doStartTag(); + tag = new ColumnsTag(); + tag.setPageContext(pageContext); + initTag(); + initParentTag(); + } - int body = tag.doAfterBody(); - while (body == tag.EVAL_BODY_AGAIN) { - body = tag.doAfterBody(); + /* + * (non-Javadoc) + * + * @see junit.framework.TestCase#tearDown() + */ + @Override + public void tearDown() throws Exception { + // TODO Auto-generated method stub + super.tearDown(); + this.tag = null; + this.parentTag = null; + this.columnsCount = 0; + this.dataTable = null; } - tag.doEndTag(); - UIComponent dataTable = getTable(); - assertNotNull(dataTable); - assertTrue(dataTable.getChildCount() == columnsCount); + /** + * Tests JSP columns tag + * + * @throws Exception + */ + public void testJspTag() throws Exception { + parentTag.doStartTag(); + tag.doStartTag(); - UIColumn column = (UIColumn) dataTable.getChildren().get(0); - assertNotNull(column); - assertTrue(column.getParent().equals(dataTable)); - } + int body = tag.doAfterBody(); + while (body == tag.EVAL_BODY_AGAIN) { + body = tag.doAfterBody(); + } + tag.doEndTag(); + parentTag.doEndTag(); + assertNotNull(dataTable); + assertTrue(dataTable.getChildCount() == columnsCount); + + UIColumn column = (UIColumn) dataTable.getChildren().get(0); + assertNotNull(column); + assertTrue(column.getParent().equals(dataTable)); + } + } Deleted: branches/community/3.3.X/ui/columns/src/test/java/org/richfaces/jsp/tag/DataTableTagMock.java =================================================================== --- branches/community/3.3.X/ui/columns/src/test/java/org/richfaces/jsp/tag/DataTableTagMock.java 2009-11-23 01:42:31 UTC (rev 15964) +++ branches/community/3.3.X/ui/columns/src/test/java/org/richfaces/jsp/tag/DataTableTagMock.java 2009-11-23 01:53:43 UTC (rev 15965) @@ -1,63 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/* - * DataTableTagMock.java Date created: 14.12.2007 - * Last modified by: $Author$ - * $Revision$ $Date$ - */ - -package org.richfaces.jsp.tag; - -import javax.faces.component.UIComponent; - -import org.richfaces.taglib.DataTableTag; - -/** - * TODO Class description goes here. - * @author Andrey Markavtsov - * - */ -public class DataTableTagMock extends DataTableTag { - - /** Component to be returned by getComponentInstatnce method */ - private UIComponent component; - - /** - * TODO Description goes here. - * @param component - */ - public DataTableTagMock(UIComponent component) { - super(); - this.component = component; - } - - /* (non-Javadoc) - * @see javax.faces.webapp.UIComponentClassicTagBase#getComponentInstance() - */ - @Override - public UIComponent getComponentInstance() { - return component; - } - - - -} Modified: branches/community/3.3.X/ui/componentControl/src/test/java/org/richfaces/component/ComponentControlTest.java =================================================================== --- branches/community/3.3.X/ui/componentControl/src/test/java/org/richfaces/component/ComponentControlTest.java 2009-11-23 01:42:31 UTC (rev 15964) +++ branches/community/3.3.X/ui/componentControl/src/test/java/org/richfaces/component/ComponentControlTest.java 2009-11-23 01:53:43 UTC (rev 15965) @@ -27,9 +27,13 @@ import javax.faces.component.UIForm; import javax.faces.component.UIInput; import javax.faces.component.UIOutput; +import javax.faces.component.UIPanel; import javax.faces.component.UIParameter; import javax.faces.component.html.HtmlForm; +import javax.faces.component.html.HtmlPanelGrid; +import javax.faces.component.html.HtmlPanelGroup; +import org.ajax4jsf.component.AjaxOutput; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import com.gargoylesoftware.htmlunit.html.HtmlElement; @@ -52,7 +56,7 @@ private UIForm form = null; private UIComponentControl componentControl = null; - private UIInput input = null; + private UIPanel panelGrid = null; private UIOutput output = null; public UIParameter param = null; @@ -65,10 +69,9 @@ form.setId("form"); facesContext.getViewRoot().getChildren().add(form); - input = new UIInput(); - input.setId("input"); - input.setValue("value"); - form.getChildren().add(input); + panelGrid = new HtmlPanelGrid(); + panelGrid.setId("input"); + form.getChildren().add(panelGrid); componentControl = (UIComponentControl) application.createComponent(UIComponentControl.COMPONENT_TYPE); componentControl.setEvent("onclick"); @@ -77,7 +80,7 @@ componentControl.setId("componentControl"); componentControl.setParams("x:'y'"); componentControl.setFor("button"); - input.getChildren().add(componentControl); + panelGrid.getChildren().add(componentControl); output = new UIOutput(); output.setId("output"); @@ -94,7 +97,7 @@ super.tearDown(); param = null; - input = null; + panelGrid = null; componentControl = null; output = null; form = null; @@ -104,10 +107,10 @@ HtmlPage page = renderView(); assertNotNull(page); - HtmlInput htmlInput = (HtmlInput)page.getHtmlElementById(input.getClientId(facesContext)); - assertNotNull(htmlInput); + HtmlElement htmlElement = (HtmlElement)page.getHtmlElementById(panelGrid.getClientId(facesContext)); + assertNotNull(htmlElement); - String eventString = htmlInput.getAttributeValue("onclick"); + String eventString = htmlElement.getAttributeValue("onclick"); assertNotNull(eventString); assertTrue(eventString.contains("Richfaces.componentControl.performOperation")); @@ -191,7 +194,7 @@ try { renderView(); assertTrue("Parameter name is null, but exception isn't thrown!", false); - } catch (IllegalArgumentException e) { + } catch (Exception e) { } } Modified: branches/community/3.3.X/ui/contextMenu/src/test/java/org/richfaces/component/ContextMenuComponentTest.java =================================================================== --- branches/community/3.3.X/ui/contextMenu/src/test/java/org/richfaces/component/ContextMenuComponentTest.java 2009-11-23 01:42:31 UTC (rev 15964) +++ branches/community/3.3.X/ui/contextMenu/src/test/java/org/richfaces/component/ContextMenuComponentTest.java 2009-11-23 01:53:43 UTC (rev 15965) @@ -22,27 +22,24 @@ package org.richfaces.component; import java.util.HashSet; -import java.util.Iterator; -import java.util.List; import java.util.Set; import javax.faces.FacesException; -import javax.faces.component.UIOutput; +import javax.faces.component.UIPanel; import javax.faces.component.UIParameter; import javax.faces.component.html.HtmlForm; +import javax.faces.component.html.HtmlPanelGroup; import javax.faces.context.FacesContext; import javax.faces.el.EvaluationException; import javax.faces.el.PropertyNotFoundException; import javax.faces.el.ValueBinding; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; -import org.apache.commons.lang.StringUtils; import com.gargoylesoftware.htmlunit.html.DomNode; import com.gargoylesoftware.htmlunit.html.DomText; import com.gargoylesoftware.htmlunit.html.HtmlElement; import com.gargoylesoftware.htmlunit.html.HtmlPage; -import com.gargoylesoftware.htmlunit.html.HtmlScript; /** * Unit test for context menu component. @@ -54,7 +51,7 @@ private UIContextMenu menu = null; private HtmlForm form = null; - private UIOutput output = null; + private UIPanel panel = null; private UIMenuItem menuItem = null; private UIParameter param = null; private UIMenuGroup menuGroup = null; @@ -91,9 +88,8 @@ form.setId("form"); facesContext.getViewRoot().getChildren().add(form); - output = new UIOutput(); - output.setId("output"); - output.setValue("value"); + panel = new HtmlPanelGroup(); + panel.setId("output"); menu = (UIContextMenu)application.createComponent(UIContextMenu.COMPONENT_TYPE); menu.setId("contextMenu"); @@ -106,14 +102,14 @@ menuGroup = (UIMenuGroup)application.createComponent(UIMenuGroup.COMPONENT_TYPE); - output.getChildren().add(menu); + panel.getChildren().add(menu); menuItem = (UIMenuItem)application.createComponent(UIMenuItem.COMPONENT_TYPE); menuItem.setId("menuItem"); menuItem.setValue("value"); menuGroup.getChildren().add(menuItem); - form.getChildren().add(output); + form.getChildren().add(panel); } public void tearDown() throws Exception { @@ -122,7 +118,7 @@ menuGroup = null; menu = null; form = null; - output = null; + panel = null; super.tearDown(); } Modified: branches/community/3.3.X/ui/core/src/test/java/org/ajax4jsf/component/QueueRendererTest.java =================================================================== --- branches/community/3.3.X/ui/core/src/test/java/org/ajax4jsf/component/QueueRendererTest.java 2009-11-23 01:42:31 UTC (rev 15964) +++ branches/community/3.3.X/ui/core/src/test/java/org/ajax4jsf/component/QueueRendererTest.java 2009-11-23 01:53:43 UTC (rev 15965) @@ -66,7 +66,9 @@ form = (UIForm) application.createComponent(UIForm.COMPONENT_TYPE); form.setId("theform"); - form.getChildren().add(application.createComponent(UIInput.COMPONENT_TYPE)); + UIComponent createComponent = application.createComponent(UIInput.COMPONENT_TYPE); + createComponent.getAttributes().put("onchange", "return true;"); + form.getChildren().add(createComponent); children.add(form); } Modified: branches/community/3.3.X/ui/core/src/test/java/org/ajax4jsf/component/UIAjaxFormTest.java =================================================================== --- branches/community/3.3.X/ui/core/src/test/java/org/ajax4jsf/component/UIAjaxFormTest.java 2009-11-23 01:42:31 UTC (rev 15964) +++ branches/community/3.3.X/ui/core/src/test/java/org/ajax4jsf/component/UIAjaxFormTest.java 2009-11-23 01:53:43 UTC (rev 15965) @@ -63,6 +63,7 @@ } }; child.setId("input"); + child.getAttributes().put("onchange", "return true;"); child.addValidator(new TestAjaxFormValidator()); childInvoked = 0; child.setId("child"); Modified: branches/community/3.3.X/ui/core/src/test/resources/org/ajax4jsf/component/queue-ajax-form.xhtml =================================================================== --- branches/community/3.3.X/ui/core/src/test/resources/org/ajax4jsf/component/queue-ajax-form.xhtml 2009-11-23 01:42:31 UTC (rev 15964) +++ branches/community/3.3.X/ui/core/src/test/resources/org/ajax4jsf/component/queue-ajax-form.xhtml 2009-11-23 01:53:43 UTC (rev 15965) @@ -17,25 +17,25 @@ <a4j:queue oncomplete="window.testResults.viewDefault = true"/> <a4j:form ajaxSubmit="true" id="viewDefault"> - <h:commandButton value="view default queue" id="link" /> + <h:commandButton onclick="return true;" value="view default queue" id="link" /> </a4j:form> <a4j:queue oncomplete="window.testResults.viewNamed = true" name="viewNamed" /> <a4j:form ajaxSubmit="true" eventsQueue="viewNamed" id="viewNamed"> - <h:commandButton value="view named queue" id="link" /> + <h:commandButton onclick="return true;" value="view named queue" id="link" /> </a4j:form> <a4j:form ajaxSubmit="true" id="formDefault"> <a4j:queue oncomplete="window.testResults.formDefault = true" /> - <h:commandButton value="form default queue" id="link" /> + <h:commandButton onclick="return true;" value="form default queue" id="link" /> </a4j:form> <a4j:form ajaxSubmit="true" eventsQueue="formQueue" id="formNamed"> <a4j:queue oncomplete="window.testResults.formNamed = true" name="formQueue" /> - <h:commandButton value="form named queue" id="link" /> + <h:commandButton onclick="return true;" value="form named queue" id="link" /> </a4j:form> </f:view> </body> Modified: branches/community/3.3.X/ui/hotKey/src/test/java/org/richfaces/component/HotKeyComponentTest.java =================================================================== --- branches/community/3.3.X/ui/hotKey/src/test/java/org/richfaces/component/HotKeyComponentTest.java 2009-11-23 01:42:31 UTC (rev 15964) +++ branches/community/3.3.X/ui/hotKey/src/test/java/org/richfaces/component/HotKeyComponentTest.java 2009-11-23 01:53:43 UTC (rev 15965) @@ -153,12 +153,12 @@ UIComponent input = application.createComponent(UIInput.COMPONENT_TYPE); input.setId("i1"); - + input.getAttributes().put("onchange", "return true;"); facesContext.getViewRoot().getChildren().add(input); input = application.createComponent(UIInput.COMPONENT_TYPE); input.setId("i2"); - + input.getAttributes().put("onchange", "return true;"); this.hotKey.getParent().getChildren().add(input); String scriptBody = processScriptBody(); Modified: branches/community/3.3.X/ui/message/src/test/java/org/richfaces/renderer/RichMessageRendererTest.java =================================================================== --- branches/community/3.3.X/ui/message/src/test/java/org/richfaces/renderer/RichMessageRendererTest.java 2009-11-23 01:42:31 UTC (rev 15964) +++ branches/community/3.3.X/ui/message/src/test/java/org/richfaces/renderer/RichMessageRendererTest.java 2009-11-23 01:53:43 UTC (rev 15965) @@ -77,24 +77,28 @@ input1 = (HtmlInputText)application.createComponent("javax.faces.HtmlInputText"); input1.setId("input1"); + input1.getAttributes().put("onchange", "return true;"); text1 = (HtmlOutputText)application.createComponent("javax.faces.HtmlOutputText"); text1.setValue("Error"); input2 = (HtmlInputText)application.createComponent("javax.faces.HtmlInputText"); input2.setId("input2"); + input2.getAttributes().put("onchange", "return true;"); text2 = (HtmlOutputText)application.createComponent("javax.faces.HtmlOutputText"); text2.setValue("Warning"); input3 = (HtmlInputText)application.createComponent("javax.faces.HtmlInputText"); input3.setId("input3"); + input3.getAttributes().put("onchange", "return true;"); text3 = (HtmlOutputText)application.createComponent("javax.faces.HtmlOutputText"); text3.setValue("Fatal"); input4 = (HtmlInputText)application.createComponent("javax.faces.HtmlInputText"); input4.setId("input4"); + input4.getAttributes().put("onchange", "return true;"); text4 = (HtmlOutputText)application.createComponent("javax.faces.HtmlOutputText"); text4.setValue("Info"); Modified: branches/community/3.3.X/ui/message/src/test/java/org/richfaces/renderer/RichMessagesRendererTest.java =================================================================== --- branches/community/3.3.X/ui/message/src/test/java/org/richfaces/renderer/RichMessagesRendererTest.java 2009-11-23 01:42:31 UTC (rev 15964) +++ branches/community/3.3.X/ui/message/src/test/java/org/richfaces/renderer/RichMessagesRendererTest.java 2009-11-23 01:53:43 UTC (rev 15965) @@ -64,6 +64,7 @@ input1 = (HtmlInputText)application.createComponent("javax.faces.HtmlInputText"); input1.setId("input1"); + input1.getAttributes().put("onchange", "return true;"); output1 = (HtmlOutputText)application.createComponent("javax.faces.HtmlOutputText"); output1.setId("output1"); @@ -71,6 +72,7 @@ input2 = (HtmlInputText)application.createComponent("javax.faces.HtmlInputText"); input2.setId("input2"); + input2.getAttributes().put("onchange", "return true;"); output2 = (HtmlOutputText)application.createComponent("javax.faces.HtmlOutputText"); output2.setId("output2"); @@ -78,6 +80,7 @@ input3 = (HtmlInputText)application.createComponent("javax.faces.HtmlInputText"); input3.setId("input3"); + input3.getAttributes().put("onchange", "return true;"); output3 = (HtmlOutputText)application.createComponent("javax.faces.HtmlOutputText"); output3.setId("output3"); @@ -85,6 +88,7 @@ input4 = (HtmlInputText)application.createComponent("javax.faces.HtmlInputText"); input4.setId("input4"); + input4.getAttributes().put("onchange", "return true;"); output4 = (HtmlOutputText)application.createComponent("javax.faces.HtmlOutputText"); output4.setId("output4"); Modified: branches/community/3.3.X/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java =================================================================== --- branches/community/3.3.X/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java 2009-11-23 01:42:31 UTC (rev 15964) +++ branches/community/3.3.X/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java 2009-11-23 01:53:43 UTC (rev 15965) @@ -530,7 +530,14 @@ data.trimToSize(); return data; } - + + public void resetValue() { + this.setValue(null); + this.setSubmittedValue(null); + this.setLocalValueSet(false); + this.setValid(true); + } + public abstract ItemState getItemState(); public interface ItemState { Modified: branches/community/3.3.X/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java =================================================================== --- branches/community/3.3.X/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java 2009-11-23 01:42:31 UTC (rev 15964) +++ branches/community/3.3.X/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java 2009-11-23 01:53:43 UTC (rev 15965) @@ -126,6 +126,7 @@ input = (UIInput)application.createComponent(UIInput.COMPONENT_TYPE); input.setValue(""); input.setId("opened"); + input.getAttributes().put("onchange", "return true;"); stp1.getChildren().add(input); command = new HtmlCommandLink(); Modified: branches/community/3.3.X/ui/suggestionbox/src/test/java/org/richfaces/component/SuggestionBoxComponentTest.java =================================================================== --- branches/community/3.3.X/ui/suggestionbox/src/test/java/org/richfaces/component/SuggestionBoxComponentTest.java 2009-11-23 01:42:31 UTC (rev 15964) +++ branches/community/3.3.X/ui/suggestionbox/src/test/java/org/richfaces/component/SuggestionBoxComponentTest.java 2009-11-23 01:53:43 UTC (rev 15965) @@ -89,6 +89,7 @@ input = new UIInput(); input.setId("text"); + input.getAttributes().put("onchange", "return true;"); form.getChildren().add(input); sb = (UISuggestionBox)application.createComponent("org.richfaces.SuggestionBox"); Modified: branches/community/3.3.X/ui/toolBar/src/test/java/org/richfaces/component/ToolBarComponentTest.java =================================================================== --- branches/community/3.3.X/ui/toolBar/src/test/java/org/richfaces/component/ToolBarComponentTest.java 2009-11-23 01:42:31 UTC (rev 15964) +++ branches/community/3.3.X/ui/toolBar/src/test/java/org/richfaces/component/ToolBarComponentTest.java 2009-11-23 01:53:43 UTC (rev 15965) @@ -75,19 +75,23 @@ UICommand button = (UICommand) application.createComponent(HtmlCommandButton.COMPONENT_TYPE); button.setValue("Change"); + button.getAttributes().put("onclick", "return true;"); toolBar.getChildren().add(button); button = (UICommand) application.createComponent(HtmlCommandButton.COMPONENT_TYPE); button.setValue("Change"); + button.getAttributes().put("onclick", "return true;"); toolBar.getChildren().add(button); UIToolBarGroup toolBarGroup = (UIToolBarGroup) application.createComponent("org.richfaces.ToolBarGroup"); toolBarGroup.setItemSeparator("disc"); button = (HtmlCommandButton) application.createComponent(HtmlCommandButton.COMPONENT_TYPE); button.setValue("Change"); + button.getAttributes().put("onclick", "return true;"); toolBarGroup.getChildren().add(button); button = (HtmlCommandButton) application.createComponent(HtmlCommandButton.COMPONENT_TYPE); button.setValue("Change"); + button.getAttributes().put("onclick", "return true;"); toolBarGroup.getChildren().add(button); toolBar.getChildren().add(toolBarGroup); @@ -95,9 +99,11 @@ toolBarGroup.setItemSeparator("grid"); button = (HtmlCommandButton) application.createComponent(HtmlCommandButton.COMPONENT_TYPE); button.setValue("Change"); + button.getAttributes().put("onclick", "return true;"); toolBarGroup.getChildren().add(button); button = (HtmlCommandButton) application.createComponent(HtmlCommandButton.COMPONENT_TYPE); button.setValue("Change"); + button.getAttributes().put("onclick", "return true;"); toolBarGroup.getChildren().add(button); toolBar.getChildren().add(toolBarGroup); @@ -105,9 +111,11 @@ toolBarGroup.setItemSeparator("line"); button = (HtmlCommandButton) application.createComponent(HtmlCommandButton.COMPONENT_TYPE); button.setValue("Change"); + button.getAttributes().put("onclick", "return true;"); toolBarGroup.getChildren().add(button); button = (HtmlCommandButton) application.createComponent(HtmlCommandButton.COMPONENT_TYPE); button.setValue("Change"); + button.getAttributes().put("onclick", "return true;"); toolBarGroup.getChildren().add(button); toolBar.getChildren().add(toolBarGroup); } Modified: branches/community/3.3.X/ui/tooltip/src/test/java/org/richfaces/renderkit/html/ToolTipRendererTest.java =================================================================== --- branches/community/3.3.X/ui/tooltip/src/test/java/org/richfaces/renderkit/html/ToolTipRendererTest.java 2009-11-23 01:42:31 UTC (rev 15964) +++ branches/community/3.3.X/ui/tooltip/src/test/java/org/richfaces/renderkit/html/ToolTipRendererTest.java 2009-11-23 01:53:43 UTC (rev 15965) @@ -23,6 +23,7 @@ import java.util.Map; import javax.faces.component.html.HtmlOutputText; +import javax.faces.component.html.HtmlPanelGroup; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.richfaces.component.UIToolTip; @@ -61,9 +62,8 @@ toolTipContent.setValue("ToolTip Conntent"); toolTip.getChildren().add(toolTipContent); - HtmlOutputText parentComp = (HtmlOutputText) application.createComponent("javax.faces.HtmlOutputText"); + HtmlPanelGroup parentComp = (HtmlPanelGroup) application.createComponent("javax.faces.HtmlPanelGroup"); parentComp.setId("parentID"); - parentComp.setValue("Text with tooltip"); parentComp.getChildren().add(toolTip); blockToolTip = (UIToolTip)application.createComponent("org.richfaces.component.ToolTip"); Modified: branches/community/3.3.X/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java =================================================================== --- branches/community/3.3.X/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java 2009-11-23 01:42:31 UTC (rev 15964) +++ branches/community/3.3.X/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java 2009-11-23 01:53:43 UTC (rev 15965) @@ -133,7 +133,7 @@ } }; input.setId("input"); - + input.getAttributes().put("onchange", "return true;"); form.getChildren().add(input); command = new HtmlCommandLink();

15 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits November 2009