[richfaces-svn-commits] JBoss Rich Faces SVN: r15968 - in branches/community/3.3.X: samples/calendar-sample/src/main/webapp/pages and 20 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Sun Nov 22 21:30:45 EST 2009
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 at 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>
+
+ <!-- for RF-7990 -->
+<!--
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>toolBar</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 at 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 at 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("<!-- Hello Cfif -->");
- }
-
- 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\"/>" +
- "<!--[if gte mso 9]><xml>\n" +
- " <w:WordDocument>\n" +
- " <w:View>Normal</w:View>\n" +
- " <w:Zoom>0</w:Zoom>\n" +
- " <w:TrackMoves/>\n" +
- " <w:TrackFormatting/>\n" +
- " <w:PunctuationKerning/>\n" +
- " <w:ValidateAgainstSchemas/>\n" +
- " <w:SaveIfXMLInvalid>false</w:SaveIfXMLInvalid>\n" +
- " <w:IgnoreMixedContent>false</w:IgnoreMixedContent>\n" +
- " <w:AlwaysShowPlaceholderText>false</w:AlwaysShowPlaceholderText>\n" +
- " <w:DoNotPromoteQF/>\n" +
- " <w:LidThemeOther>EN-US</w:LidThemeOther>\n" +
- " <w:LidThemeAsian>X-NONE</w:LidThemeAsian>\n" +
- " <w:LidThemeComplexScript>X-NONE</w:LidThemeComplexScript>\n" +
- " <w:Compatibility>\n" +
- " <w:BreakWrappedTables/>\n" +
- " <w:SnapToGridInCell/>\n" +
- " <w:WrapTextWithPunct/>\n" +
- " <w:UseAsianBreakRules/>\n" +
- " <w:DontGrowAutofit/>\n" +
- " <w:SplitPgBreakAndParaMark/>\n" +
- " <w:DontVertAlignCellWithSp/>\n" +
- " <w:DontBreakConstrainedForcedTables/>\n" +
- " <w:DontVertAlignInTxbx/>\n" +
- " <w:Word11KerningPairs/>\n" +
- " <w:CachedColBalance/>\n" +
- " </w:Compatibility>\n" +
- " <w:BrowserLevel>MicrosoftInternetExplorer4</w:BrowserLevel>\n" +
- " <m:mathPr>\n" +
- " <m:mathFont m:val=\"Cambria Math\"/>\n" +
- " <m:brkBin m:val=\"before\"/>\n" +
- " <m:brkBinSub m:val=\"-\"/>\n" +
- " <m:smallFrac m:val=\"off\"/>\n" +
- " <m:dispDef/>\n" +
- " <m:lMargin m:val=\"0\"/>\n" +
- " <m:rMargin m:val=\"0\"/>\n" +
- " <m:defJc m:val=\"centerGroup\"/>\n" +
- " <m:wrapIndent m:val=\"1440\"/>\n" +
- " <m:intLim m:val=\"subSup\"/>\n" +
- " <m:naryLim m:val=\"undOvr\"/>\n" +
- " </m:mathPr></w:WordDocument>\n" +
- "</xml><![endif]-->" +
- "<!--[if gte mso 9]><xml>\n" +
- " <w:LatentStyles DefLockedState=\"false\" DefUnhideWhenUsed=\"true\"\n" +
- " DefSemiHidden=\"true\" DefQFormat=\"false\" DefPriority=\"99\"\n" +
- " LatentStyleCount=\"267\">\n" +
- " <w:LsdException Locked=\"false\" Priority=\"0\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Normal\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"9\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"heading 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"9\" QFormat=\"true\" Name=\"heading 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"9\" QFormat=\"true\" Name=\"heading 3\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"9\" QFormat=\"true\" Name=\"heading 4\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"9\" QFormat=\"true\" Name=\"heading 5\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"9\" QFormat=\"true\" Name=\"heading 6\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"9\" QFormat=\"true\" Name=\"heading 7\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"9\" QFormat=\"true\" Name=\"heading 8\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"9\" QFormat=\"true\" Name=\"heading 9\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 3\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 4\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 5\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 6\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 7\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 8\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 9\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"35\" QFormat=\"true\" Name=\"caption\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"10\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Title\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"1\" Name=\"Default Paragraph Font\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"11\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Subtitle\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"22\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Strong\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"20\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Emphasis\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"59\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Table Grid\"/>\n" +
- " <w:LsdException Locked=\"false\" UnhideWhenUsed=\"false\" Name=\"Placeholder Text\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"1\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"No Spacing\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"60\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light Shading\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"61\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light List\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"62\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light Grid\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"63\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Shading 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"64\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Shading 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"65\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium List 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"66\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium List 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"67\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"68\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"69\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 3\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"70\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Dark List\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"71\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful Shading\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"72\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful List\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"73\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful Grid\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"60\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light Shading Accent 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"61\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light List Accent 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"62\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light Grid Accent 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"63\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Shading 1 Accent 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"64\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Shading 2 Accent 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"65\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium List 1 Accent 1\"/>\n" +
- " <w:LsdException Locked=\"false\" UnhideWhenUsed=\"false\" Name=\"Revision\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"34\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"List Paragraph\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"29\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Quote\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"30\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Intense Quote\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"66\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium List 2 Accent 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"67\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 1 Accent 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"68\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 2 Accent 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"69\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 3 Accent 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"70\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Dark List Accent 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"71\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful Shading Accent 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"72\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful List Accent 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"73\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful Grid Accent 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"60\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light Shading Accent 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"61\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light List Accent 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"62\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light Grid Accent 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"63\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Shading 1 Accent 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"64\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Shading 2 Accent 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"65\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium List 1 Accent 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"66\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium List 2 Accent 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"67\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 1 Accent 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"68\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 2 Accent 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"69\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 3 Accent 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"70\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Dark List Accent 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"71\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful Shading Accent 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"72\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful List Accent 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"73\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful Grid Accent 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"60\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light Shading Accent 3\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"61\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light List Accent 3\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"62\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light Grid Accent 3\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"63\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Shading 1 Accent 3\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"64\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Shading 2 Accent 3\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"65\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium List 1 Accent 3\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"66\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium List 2 Accent 3\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"67\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 1 Accent 3\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"68\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 2 Accent 3\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"69\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 3 Accent 3\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"70\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Dark List Accent 3\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"71\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful Shading Accent 3\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"72\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful List Accent 3\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"73\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful Grid Accent 3\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"60\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light Shading Accent 4\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"61\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light List Accent 4\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"62\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light Grid Accent 4\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"63\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Shading 1 Accent 4\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"64\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Shading 2 Accent 4\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"65\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium List 1 Accent 4\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"66\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium List 2 Accent 4\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"67\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 1 Accent 4\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"68\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 2 Accent 4\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"69\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 3 Accent 4\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"70\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Dark List Accent 4\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"71\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful Shading Accent 4\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"72\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful List Accent 4\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"73\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful Grid Accent 4\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"60\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light Shading Accent 5\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"61\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light List Accent 5\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"62\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light Grid Accent 5\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"63\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Shading 1 Accent 5\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"64\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Shading 2 Accent 5\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"65\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium List 1 Accent 5\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"66\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium List 2 Accent 5\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"67\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 1 Accent 5\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"68\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 2 Accent 5\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"69\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 3 Accent 5\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"70\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Dark List Accent 5\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"71\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful Shading Accent 5\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"72\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful List Accent 5\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"73\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful Grid Accent 5\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"60\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light Shading Accent 6\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"61\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light List Accent 6\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"62\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light Grid Accent 6\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"63\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Shading 1 Accent 6\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"64\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Shading 2 Accent 6\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"65\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium List 1 Accent 6\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"66\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium List 2 Accent 6\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"67\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 1 Accent 6\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"68\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 2 Accent 6\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"69\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 3 Accent 6\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"70\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Dark List Accent 6\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"71\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful Shading Accent 6\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"72\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful List Accent 6\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"73\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful Grid Accent 6\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"19\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Subtle Emphasis\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"21\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Intense Emphasis\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"31\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Subtle Reference\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"32\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Intense Reference\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"33\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Book Title\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"37\" Name=\"Bibliography\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"39\" QFormat=\"true\" Name=\"TOC Heading\"/>\n" +
- " </w:LatentStyles>\n" +
- "</xml><![endif]" +
- "-->" +
- "<style>\n" +
- "<!--\n" +
- " /* Font Definitions */\n" +
- " @font-face\n" +
- "\t{font-family:\"Cambria Math\";\n" +
- "\tpanose-1:2 4 5 3 5 4 6 3 2 4;\n" +
- "\tmso-font-charset:204;\n" +
- "\tmso-generic-font-family:roman;\n" +
- "\tmso-font-pitch:variable;\n" +
- "\tmso-font-signature:-1610611985 1107304683 0 0 159 0;}\n" +
- "@font-face\n" +
- "\t{font-family:Calibri;\n" +
- "\tpanose-1:2 15 5 2 2 2 4 3 2 4;\n" +
- "\tmso-font-charset:204;\n" +
- "\tmso-generic-font-family:swiss;\n" +
- "\tmso-font-pitch:variable;\n" +
- "\tmso-font-signature:-1610611985 1073750139 0 0 159 0;}\n" +
- " /* Style Definitions */\n" +
- " p.MsoNormal, li.MsoNormal, div.MsoNormal\n" +
- "\t{mso-style-unhide:no;\n" +
- "\tmso-style-qformat:yes;\n" +
- "\tmso-style-parent:\"\";\n" +
- "\tmargin-top:0in;\n" +
- "\tmargin-right:0in;\n" +
- "\tmargin-bottom:10.0pt;\n" +
- "\tmargin-left:0in;\n" +
- "\tline-height:115%;\n" +
- "\tmso-pagination:widow-orphan;\n" +
- "\tfont-size:11.0pt;\n" +
- "\tfont-family:\"Calibri\",\"sans-serif\";\n" +
- "\tmso-ascii-font-family:Calibri;\n" +
- "\tmso-ascii-theme-font:minor-latin;\n" +
- "\tmso-fareast-font-family:Calibri;\n" +
- "\tmso-fareast-theme-font:minor-latin;\n" +
- "\tmso-hansi-font-family:Calibri;\n" +
- "\tmso-hansi-theme-font:minor-latin;\n" +
- "\tmso-bidi-font-family:\"Times New Roman\";\n" +
- "\tmso-bidi-theme-font:minor-bidi;}\n" +
- "a:link, span.MsoHyperlink\n" +
- "\t{mso-style-noshow:yes;\n" +
- "\tmso-style-priority:99;\n" +
- "\tcolor:blue;\n" +
- "\ttext-decoration:underline;\n" +
- "\ttext-underline:single;}\n" +
- "a:visited, span.MsoHyperlinkFollowed\n" +
- "\t{mso-style-noshow:yes;\n" +
- "\tmso-style-priority:99;\n" +
- "\tcolor:purple;\n" +
- "\tmso-themecolor:followedhyperlink;\n" +
- "\ttext-decoration:underline;\n" +
- "\ttext-underline:single;}\n" +
- "p\n" +
- "\t{mso-style-noshow:yes;\n" +
- "\tmso-style-priority:99;\n" +
- "\tmso-margin-top-alt:auto;\n" +
- "\tmargin-right:0in;\n" +
- "\tmargin-bottom:5.75pt;\n" +
- "\tmargin-left:0in;\n" +
- "\tmso-pagination:widow-orphan;\n" +
- "\tfont-size:12.0pt;\n" +
- "\tfont-family:\"Times New Roman\",\"serif\";\n" +
- "\tmso-fareast-font-family:\"Times New Roman\";}\n" +
- ".MsoChpDefault\n" +
- "\t{mso-style-type:export-only;\n" +
- "\tmso-default-props:yes;\n" +
- "\tmso-ascii-font-family:Calibri;\n" +
- "\tmso-ascii-theme-font:minor-latin;\n" +
- "\tmso-fareast-font-family:Calibri;\n" +
- "\tmso-fareast-theme-font:minor-latin;\n" +
- "\tmso-hansi-font-family:Calibri;\n" +
- "\tmso-hansi-theme-font:minor-latin;\n" +
- "\tmso-bidi-font-family:\"Times New Roman\";\n" +
- "\tmso-bidi-theme-font:minor-bidi;}\n" +
- ".MsoPapDefault\n" +
- "\t{mso-style-type:export-only;\n" +
- "\tmargin-bottom:10.0pt;\n" +
- "\tline-height:115%;}\n" +
- "@page Section1\n" +
- "\t{size:595.3pt 841.9pt;\n" +
- "\tmargin:56.7pt 42.5pt 56.7pt 85.05pt;\n" +
- "\tmso-header-margin:.5in;\n" +
- "\tmso-footer-margin:.5in;\n" +
- "\tmso-paper-source:0;}\n" +
- "div.Section1\n" +
- "\t{page:Section1;}\n" +
- "-->\n" +
- "</style>" +
- "<!--[if gte mso 10]>\n" +
- "<style>\n" +
- " /* Style Definitions */\n" +
- " table.MsoNormalTable\n" +
- "\t{mso-style-name:\"?z?±N‹N‡???°N? N‚?°?±?»??N†?°\";\n" +
- "\tmso-tstyle-rowband-size:0;\n" +
- "\tmso-tstyle-colband-size:0;\n" +
- "\tmso-style-noshow:yes;\n" +
- "\tmso-style-priority:99;\n" +
- "\tmso-style-qformat:yes;\n" +
- "\tmso-style-parent:\"\";\n" +
- "\tmso-padding-alt:0in 5.4pt 0in 5.4pt;\n" +
- "\tmso-para-margin-top:0in;\n" +
- "\tmso-para-margin-right:0in;\n" +
- "\tmso-para-margin-bottom:10.0pt;\n" +
- "\tmso-para-margin-left:0in;\n" +
- "\tline-height:115%;\n" +
- "\tmso-pagination:widow-orphan;\n" +
- "\tfont-size:11.0pt;\n" +
- "\tfont-family:\"Calibri\",\"sans-serif\";\n" +
- "\tmso-ascii-font-family:Calibri;\n" +
- "\tmso-ascii-theme-font:minor-latin;\n" +
- "\tmso-fareast-font-family:\"Times New Roman\";\n" +
- "\tmso-fareast-theme-font:minor-fareast;\n" +
- "\tmso-hansi-font-family:Calibri;\n" +
- "\tmso-hansi-theme-font:minor-latin;}\n" +
- "</style>\n" +
- "<![endif]" +
- "-->\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\"><!--" +
- " <!" +
- " @page { margin: 0.79in }" +
- " P { margin-bottom: 0.08in }" +
- " >" +
- " --></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">
More information about the richfaces-svn-commits
mailing list