JBoss Rich Faces SVN: r14386 - branches/community/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-05-28 08:36:13 -0400 (Thu, 28 May 2009)
New Revision: 14386
Modified:
branches/community/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java
Log:
Fix RF-7203 RF-4508
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-05-28 11:40:15 UTC (rev 14385)
+++ branches/community/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2009-05-28 12:36:13 UTC (rev 14386)
@@ -40,6 +40,7 @@
import org.ajax4jsf.renderkit.AjaxRendererUtils;
import org.ajax4jsf.renderkit.ComponentVariables;
import org.ajax4jsf.renderkit.ComponentsVariableResolver;
+import org.ajax4jsf.renderkit.RendererUtils.HTML;
import org.richfaces.component.MenuComponent;
import org.richfaces.component.UIMenuItem;
import org.richfaces.component.util.ViewUtil;
@@ -185,7 +186,7 @@
String attrStr = "";
if (!(menuItem.getParent() instanceof MenuComponent))
{
- String styleClass = (String) menuItem.getAttributes().get("styleClass");
+ String styleClass = (String) menuItem.getAttributes().get(HTML.STYLE_CLASS_ATTR);
String str = "";
attr.append(",{");
if (null!=styleClass && styleClass.length()>0) {
@@ -193,7 +194,7 @@
attr.append(ScriptUtils.toScript(styleClass));
str = ",";
}
- String onselect = (String) menuItem.getAttributes().get("onselect");
+ String onselect = (String) menuItem.getAttributes().get(HTML.onselect_ATTRIBUTE);
if (null!=onselect && onselect.length()>0) {
attr.append(str);
attr.append("onselect:function(event){");
@@ -222,8 +223,19 @@
scriptValue.append("RichFaces.Menu.updateItem(event,this");
scriptValue.append(attrStr);
scriptValue.append(");");
- scriptValue.append(AjaxRendererUtils.buildOnClick(
- menuItem, context).toString());
+ String event = null;
+ Object onclick = menuItem.getAttributes().get(HTML.onclick_ATTRIBUTE);
+ if(onclick != null && onclick.toString().length()>0){
+ event = HTML.onclick_ATTRIBUTE;
+ }else{
+ Object onselect = menuItem.getAttributes().get(HTML.onselect_ATTRIBUTE);
+ if(onselect != null && onselect.toString().length()>0){
+ event = HTML.onselect_ATTRIBUTE;
+ }
+ }
+ scriptValue.append(AjaxRendererUtils.buildOnEvent(
+ menuItem, context, event).toString());
+ menuItem.getAttributes().put(HTML.onselect_ATTRIBUTE, null);
} else if (MenuComponent.MODE_SERVER.equalsIgnoreCase(mode)) {
/*
@@ -257,6 +269,11 @@
scriptValue.append(",");
scriptValue.append("params);return false;");
*/
+ Object onclick = menuItem.getAttributes().get(HTML.onclick_ATTRIBUTE);
+ if(onclick != null && onclick.toString().length()>0){
+ scriptValue.append(onclick.toString());
+ scriptValue.append(";");
+ }
scriptValue.append("RichFaces.Menu.submitForm(event,this");
String params = encodeParamsAsObject(context, menuItem);
if (null!=params) {
@@ -276,10 +293,10 @@
scriptValue.append("RichFaces.Menu.updateItem(event,this");
scriptValue.append(attrStr);
scriptValue.append(");");
- scriptValue.append(getStringAttributeOrEmptyString(menuItem, "onclick"));
+ scriptValue.append(getStringAttributeOrEmptyString(menuItem, HTML.onclick_ATTRIBUTE));
}
if (resource.length() > 0) {
- variables.setVariable("onclick", scriptValue.toString());
+ variables.setVariable(HTML.onclick_ATTRIBUTE, scriptValue.toString());
}
//-------------------------------
}
14 years, 11 months
JBoss Rich Faces SVN: r14385 - branches/community/3.3.X/test-applications/jsp/src/main/webapp/TabPanel.
by richfaces-svn-commits＠lists.jboss.org
Author: Vadim Mikovoz
Date: 2009-05-28 07:40:15 -0400 (Thu, 28 May 2009)
New Revision: 14385
Modified:
branches/community/3.3.X/test-applications/jsp/src/main/webapp/TabPanel/TabPanel.jsp
Log:
Modified: branches/community/3.3.X/test-applications/jsp/src/main/webapp/TabPanel/TabPanel.jsp
===================================================================
--- branches/community/3.3.X/test-applications/jsp/src/main/webapp/TabPanel/TabPanel.jsp 2009-05-28 11:08:35 UTC (rev 14384)
+++ branches/community/3.3.X/test-applications/jsp/src/main/webapp/TabPanel/TabPanel.jsp 2009-05-28 11:40:15 UTC (rev 14385)
@@ -22,7 +22,7 @@
onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}"
onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}">
- <rich:tab id="tabOne" binding="#{tabPanel.htmlTab}"
+ <rich:tab id="tabOne" binding="#{tabPanel.htmlTab}" label="Tab with link"
labelWidth="#{tabPanel.labelWidth}" onclick="#{event.onclick}"
oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}"
onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}"
@@ -37,10 +37,7 @@
onbeforedomupdate="#{event.onbeforedomupdate}"
onlabelkeydown="#{event.onlabelkeydown}"
onlabelkeypress="#{event.onlabelkeypress}"
- onlabelkeyup="#{event.onlabelkeyup}">
- <f:facet name="label">
- <h:inputText value="" />
- </f:facet>
+ onlabelkeyup="#{event.onlabelkeyup}">
<h:outputText value="This is tab panel test example"
styleClass="text1"></h:outputText>
<h:outputLink value="http://www.jboss.com/">
14 years, 11 months
JBoss Rich Faces SVN: r14383 - branches/community/3.3.X/ui/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/css.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2009-05-28 04:56:15 -0400 (Thu, 28 May 2009)
New Revision: 14383
Modified:
branches/community/3.3.X/ui/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/css/spinner.xcss
Log:
RF-7221
Modified: branches/community/3.3.X/ui/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/css/spinner.xcss
===================================================================
--- branches/community/3.3.X/ui/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/css/spinner.xcss 2009-05-28 08:49:44 UTC (rev 14382)
+++ branches/community/3.3.X/ui/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/css/spinner.xcss 2009-05-28 08:56:15 UTC (rev 14383)
@@ -38,7 +38,7 @@
border-style: none;
}
-.rich-spinner-bp{
+.rich-spinner-btn-press{
margin: 1px 0px 0px 1px;
display: block;
border-style: none;
14 years, 11 months
JBoss Rich Faces SVN: r14382 - in branches/community/3.3.X/ui/inputnumber-spinner/src: main/templates and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2009-05-28 04:49:44 -0400 (Thu, 28 May 2009)
New Revision: 14382
Modified:
branches/community/3.3.X/ui/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/css/spinner.xcss
branches/community/3.3.X/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx
branches/community/3.3.X/ui/inputnumber-spinner/src/test/java/org/richfaces/component/InputNumberSpinnerComponentTest.java
Log:
RF-7221
Modified: branches/community/3.3.X/ui/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/css/spinner.xcss
===================================================================
--- branches/community/3.3.X/ui/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/css/spinner.xcss 2009-05-27 19:14:49 UTC (rev 14381)
+++ branches/community/3.3.X/ui/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/css/spinner.xcss 2009-05-28 08:49:44 UTC (rev 14382)
@@ -32,7 +32,7 @@
font-size: 0px;
}
-.rich-spinner-bn{
+.rich-spinner-btn{
margin: 0px 1px 1px 0px;
display: block;
border-style: none;
Modified: branches/community/3.3.X/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx
===================================================================
--- branches/community/3.3.X/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx 2009-05-27 19:14:49 UTC (rev 14381)
+++ branches/community/3.3.X/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx 2009-05-28 08:49:44 UTC (rev 14382)
@@ -79,12 +79,12 @@
<input
type="image"
src="#{up_arrow}"
- class="rich-spinner-bn rich-spinner-button"
+ class="rich-spinner-btn"
style="border:0"
onclick="return false"
- onmousedown="this.className='rich-spinner-bp rich-spinner-button'"
- onmouseup="this.className='rich-spinner-bn rich-spinner-button'"
- onmouseout="this.className='rich-spinner-bn rich-spinner-button'"
+ onmousedown="this.className='rich-spinner-btn-press'"
+ onmouseup="this.className='rich-spinner-btn'"
+ onmouseout="this.className='rich-spinner-btn'"
tabindex="#{component.attributes['tabindex']}" />
<jsp:scriptlet><![CDATA[
} else {
@@ -92,7 +92,7 @@
<input
type="image"
src="#{up_arrow}"
- class="rich-spinner-bn rich-spinner-button"
+ class="rich-spinner-btn"
style="border:0"
onclick="return false"
tabindex="#{component.attributes['tabindex']}" />
@@ -106,12 +106,12 @@
<jsp:scriptlet><![CDATA[
if (! disabled) {
]]></jsp:scriptlet>
- <input type="image" src="#{down_arrow}" class="rich-spinner-bn rich-spinner-button" style="border:0" onclick="return false"
- onmousedown="this.className='rich-spinner-bp rich-spinner-button'" onmouseup="this.className='rich-spinner-bn rich-spinner-button'" onmouseout="this.className='rich-spinner-bn rich-spinner-button'" />
+ <input type="image" src="#{down_arrow}" class="rich-spinner-btn" style="border:0" onclick="return false"
+ onmousedown="this.className='rich-spinner-btn-press'" onmouseup="this.className='rich-spinner-btn'" onmouseout="this.className='rich-spinner-btn'" />
<jsp:scriptlet><![CDATA[
} else {
]]></jsp:scriptlet>
- <input type="image" src="#{down_arrow}" class="rich-spinner-bn rich-spinner-button" style="border:0" onclick="return false" />
+ <input type="image" src="#{down_arrow}" class="rich-spinner-btn" style="border:0" onclick="return false" />
<jsp:scriptlet><![CDATA[
}
]]></jsp:scriptlet>
Modified: branches/community/3.3.X/ui/inputnumber-spinner/src/test/java/org/richfaces/component/InputNumberSpinnerComponentTest.java
===================================================================
--- branches/community/3.3.X/ui/inputnumber-spinner/src/test/java/org/richfaces/component/InputNumberSpinnerComponentTest.java 2009-05-27 19:14:49 UTC (rev 14381)
+++ branches/community/3.3.X/ui/inputnumber-spinner/src/test/java/org/richfaces/component/InputNumberSpinnerComponentTest.java 2009-05-28 08:49:44 UTC (rev 14382)
@@ -144,7 +144,7 @@
HtmlInput child = (HtmlInput) iter.next();
assertTrue(child.getTypeAttribute().equals("image"));
assertTrue(child.getAttributeValue("class").contains(
- "rich-spinner-bn rich-spinner-button"));
+ "rich-spinner-btn"));
}
}
14 years, 11 months
JBoss Rich Faces SVN: r14381 - in branches/community/3.3.X/ui: dataTable/src/main/config/component and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: smukhina
Date: 2009-05-27 15:14:49 -0400 (Wed, 27 May 2009)
New Revision: 14381
Modified:
branches/community/3.3.X/ui/columns/src/main/config/component/columns.xml
branches/community/3.3.X/ui/dataTable/src/main/config/component/dataTable.xml
Log:
https://jira.jboss.org/jira/browse/RF-6946 attributes descriptions are corrected
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-05-27 16:37:53 UTC (rev 14380)
+++ branches/community/3.3.X/ui/columns/src/main/config/component/columns.xml 2009-05-27 19:14:49 UTC (rev 14381)
@@ -56,14 +56,14 @@
<name>begin</name>
<classname>java.lang.Object</classname>
<description>
- The first iteration item
+ Contains the first iteration item
</description>
</property>
<property>
<name>end</name>
<classname>java.lang.Object</classname>
<description>
- The last iteration item
+ Contains the last iteration item
</description>
</property>
<property hidden="true">
Modified: branches/community/3.3.X/ui/dataTable/src/main/config/component/dataTable.xml
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/main/config/component/dataTable.xml 2009-05-27 16:37:53 UTC (rev 14380)
+++ branches/community/3.3.X/ui/dataTable/src/main/config/component/dataTable.xml 2009-05-27 19:14:49 UTC (rev 14381)
@@ -57,7 +57,7 @@
<property>
<name>columns</name>
<classname>int</classname>
- <description>Number of columns
+ <description>Specifies the number of columns
</description>
</property>
<property>
14 years, 11 months
JBoss Rich Faces SVN: r14380 - in branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng: rf5772 and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2009-05-27 12:37:53 -0400 (Wed, 27 May 2009)
New Revision: 14380
Modified:
branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf5758/Test.java
branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf5772/Test.java
branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf5835/Test.java
Log:
test correction according to convention rules.
Modified: branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf5758/Test.java
===================================================================
--- branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf5758/Test.java 2009-05-27 16:31:51 UTC (rev 14379)
+++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf5758/Test.java 2009-05-27 16:37:53 UTC (rev 14380)
@@ -1,16 +1,14 @@
package org.richfaces.testng.rf5758;
import org.richfaces.SeleniumTestBase;
+import org.testng.Assert;
public class Test extends SeleniumTestBase {
@org.testng.annotations.Test
public void testExecute() throws Exception{
- renderPage();
- String str;
- if((str = selenium.getValue("//form/span/input")).compareTo("Item 45") != 0){
- throw new AssertionError("Expected: <Item 45>; Actual: <" + str + ">");
- }
+ renderPage();
+ Assert.assertEquals(selenium.getValue("//form/span/input"),"Item 45");
}
@Override
Modified: branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf5772/Test.java
===================================================================
--- branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf5772/Test.java 2009-05-27 16:31:51 UTC (rev 14379)
+++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf5772/Test.java 2009-05-27 16:37:53 UTC (rev 14380)
@@ -1,6 +1,7 @@
package org.richfaces.testng.rf5772;
import org.richfaces.SeleniumTestBase;
+import org.testng.Assert;
public class Test extends SeleniumTestBase {
@@ -14,10 +15,7 @@
selenium.doubleClick("form:listShuttleID:0");
Number l2 = selenium.getElementPositionLeft("form:listShuttleID:0");
- if(l1.intValue()==l2.intValue()){
- throw new AssertionError("item didn't move to target");
- }
-
+ Assert.assertNotSame(l2, l1);
}
@Override
Modified: branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf5835/Test.java
===================================================================
--- branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf5835/Test.java 2009-05-27 16:31:51 UTC (rev 14379)
+++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf5835/Test.java 2009-05-27 16:37:53 UTC (rev 14380)
@@ -1,6 +1,7 @@
package org.richfaces.testng.rf5835;
import org.richfaces.SeleniumTestBase;
+import org.testng.Assert;
public class Test extends SeleniumTestBase {
@@ -11,18 +12,17 @@
clickAjaxCommandAndWait("form:tree:10::_defaultNodeFace:handle");
//check if line is present in expanded childs
- Number childs = getHeightById("form:tree:10::_defaultNodeFace:childs");
- Number child = selenium.getElementHeight("//div[@id='form:tree:10::_defaultNodeFace:childs']/table[1]");
- int dif = 0;
+ Number actual = getHeightById("form:tree:10::_defaultNodeFace:childs");
+ Number expected = selenium.getElementHeight("//div[@id='form:tree:10::_defaultNodeFace:childs']/table[1]");
- if(!((dif=(10*child.intValue() - childs.intValue())) == 0)){
- throw new AssertionError("white line is after the last child:" + dif);
- }
+ Assert.assertEquals(actual.intValue(), 10*expected.intValue());
+
//check if line is present after expanded childs
- if((dif = getHeightById("form:tree").intValue() - getHeightById("form:tree:childs").intValue()) != 0){
- throw new AssertionError("white line is after all childs:" + dif);
- }
+ actual = getHeightById("form:tree");
+ expected = getHeightById("form:tree:childs");
+ Assert.assertEquals(actual.intValue(), expected.intValue());
+
}
@Override
14 years, 11 months
JBoss Rich Faces SVN: r14379 - branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-05-27 12:31:51 -0400 (Wed, 27 May 2009)
New Revision: 14379
Modified:
branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
Log:
https://jira.jboss.org/jira/browse/RF-4731
Modified: branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2009-05-27 15:41:03 UTC (rev 14378)
+++ branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2009-05-27 16:31:51 UTC (rev 14379)
@@ -167,9 +167,13 @@
int numberOfColumns) throws IOException {
UIComponent header = table.getHeader();
- boolean columnFacetPresent = isColumnFacetPresent(table, "header");
- boolean isFilterByPresent = isHeaderFactoryColumnAttributePresent(table, "filterBy");
- if (header != null || columnFacetPresent || isFilterByPresent) {
+
+ boolean isEncodeHeaders = isColumnFacetPresent(table, "header") ||
+ isHeaderFactoryColumnAttributePresent(table, "sortBy") ||
+ isHeaderFactoryColumnAttributePresent(table, "comparator") ||
+ isHeaderFactoryColumnAttributePresent(table, "filterBy");
+
+ if (header != null || isEncodeHeaders) {
ResponseWriter writer = context.getResponseWriter();
writer.startElement("thead", table);
@@ -183,7 +187,7 @@
headerClass, "th");
}
- if (columnFacetPresent || isFilterByPresent) {
+ if (isEncodeHeaders) {
writer.startElement("tr", table);
encodeStyleClass(writer, null,
"rich-table-subheader", null,
14 years, 11 months
JBoss Rich Faces SVN: r14378 - in branches/community/3.3.X/ui/scrollableDataTable/src: main/javascript/ClientUI/controls/grid and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2009-05-27 11:41:03 -0400 (Wed, 27 May 2009)
New Revision: 14378
Modified:
branches/community/3.3.X/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java
branches/community/3.3.X/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableRendererState.java
branches/community/3.3.X/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/SortIconRenderer.java
branches/community/3.3.X/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js
branches/community/3.3.X/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Selection.js
branches/community/3.3.X/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss
branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-cell.jspx
branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-footer-cell.jspx
branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-cell.jspx
branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-itself.jspx
branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table.jspx
branches/community/3.3.X/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererTest.java
branches/community/3.3.X/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/SortIconRendererTest.java
Log:
RF-7218
Modified: branches/community/3.3.X/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java
===================================================================
--- branches/community/3.3.X/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2009-05-27 15:22:09 UTC (rev 14377)
+++ branches/community/3.3.X/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2009-05-27 15:41:03 UTC (rev 14378)
@@ -202,7 +202,7 @@
widthPx = getFormattedWidth(widthPx);
int width = Integer.parseInt(widthPx);
- writer.writeText("#" + getNormalizedId(context, state.getGrid())+ " .dr-sdt-c-" + cell_index + " {", "width");
+ writer.writeText("#" + getNormalizedId(context, state.getGrid())+ " .rich-sdt-c-" + cell_index + " {", "width");
writer.writeText("width: " + width + "px;", "width");
writer.writeText("}", "width");
return 0;
@@ -345,7 +345,7 @@
writer.startElement(HTML.TR_ELEMENT, grid);
state.setFrozenColumnCount(ScrollableDataTableUtils.getFrozenColumnsCount(grid));
getUtils().writeAttribute(writer, "id",row_id);
- getUtils().writeAttribute(writer, "class","dr-sdt-rb rich-sdt-row " + state.getRowClass());
+ getUtils().writeAttribute(writer, "class","rich-sdt-row " + state.getRowClass());
addRowJavascriptEvents(writer, grid);
if (log.isDebugEnabled()) {
log.debug("rowIndex : " + index);
@@ -354,9 +354,9 @@
ColumnWalker.iterateOverColumns(context, grid, cellRenderer, writer, state);
if(!state.isFrozenPart()){
writer.startElement("td", grid);
- getUtils().writeAttribute(writer, "class","dr-sdt-bc dr-sdt-c-f rich-sdt-column-cell " + state.getColumnClass(state.getCellIndex()));
+ getUtils().writeAttribute(writer, "class","rich-sdt-c-f rich-sdt-column-cell " + state.getColumnClass(state.getCellIndex()));
writer.startElement(HTML.DIV_ELEM, grid);
- getUtils().writeAttribute(writer, "class","dr-sdt-cbody");
+ getUtils().writeAttribute(writer, "class","rich-sdt-column-cell-body");
writer.endElement(HTML.DIV_ELEM);
writer.endElement("td");
}
@@ -407,7 +407,7 @@
row_id = baseClientId + ":f:" + state.getRowIndex();
writer.startElement("tr", grid);
- getUtils().writeAttribute(writer, "class","dr-sdt-rb rich-sdt-row " + state.getRowClass());
+ getUtils().writeAttribute(writer, "class","rich-sdt-row " + state.getRowClass());
getUtils().writeAttribute(writer,"id",row_id);
addRowJavascriptEvents(writer, grid);
collection.add(row_id);
@@ -438,9 +438,9 @@
writer, baseClientId);
}
writer.startElement("td", grid);
- getUtils().writeAttribute(writer, "class","dr-sdt-bc dr-sdt-c-f rich-sdt-column-cell " + state.getColumnClass(state.getCellIndex()));
+ getUtils().writeAttribute(writer, "class","rich-sdt-c-f rich-sdt-column-cell " + state.getColumnClass(state.getCellIndex()));
writer.startElement(HTML.DIV_ELEM, grid);
- getUtils().writeAttribute(writer, "class","dr-sdt-cbody");
+ getUtils().writeAttribute(writer, "class","rich-sdt-column-cell-body");
writer.endElement(HTML.DIV_ELEM);
writer.endElement("td");
writer.endElement("tr");
@@ -462,7 +462,7 @@
writer.startElement("tr", grid);
getUtils().writeAttribute(writer,"id",row_id);
- getUtils().writeAttribute(writer, "class","dr-sdt-rb rich-sdt-row " + state.getRowClass());
+ getUtils().writeAttribute(writer, "class","rich-sdt-row " + state.getRowClass());
addRowJavascriptEvents(writer, grid);
collection.add(row_id);
}
@@ -588,7 +588,7 @@
ScrollableDataTableRendererState state = ScrollableDataTableRendererState.getRendererState(context);
ColumnWalker.iterateOverColumns(context, grid, styleRenderer, context.getResponseWriter(), state);
ResponseWriter writer = context.getResponseWriter();
- writer.writeText("#" + getNormalizedId(context, state.getGrid()) + " .dr-sdt-c-f {", "width");
+ writer.writeText("#" + getNormalizedId(context, state.getGrid()) + " .rich-sdt-c-f {", "width");
writer.writeText("width: 0px;", "width");
writer.writeText("}", "width");
}
Modified: branches/community/3.3.X/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableRendererState.java
===================================================================
--- branches/community/3.3.X/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableRendererState.java 2009-05-27 15:22:09 UTC (rev 14377)
+++ branches/community/3.3.X/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableRendererState.java 2009-05-27 15:41:03 UTC (rev 14378)
@@ -422,7 +422,7 @@
}
public String getRowClass() {
- return getRowClass(getRowIndex()) + (isFake() ? " dr-sdt-fake-r rich-sdt-fake-r " : "");
+ return getRowClass(getRowIndex()) + (isFake() ? " rich-sdt-fake-r " : "");
}
private String getRowClass(int index) {
Modified: branches/community/3.3.X/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/SortIconRenderer.java
===================================================================
--- branches/community/3.3.X/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/SortIconRenderer.java 2009-05-27 15:22:09 UTC (rev 14377)
+++ branches/community/3.3.X/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/SortIconRenderer.java 2009-05-27 15:41:03 UTC (rev 14378)
@@ -37,11 +37,11 @@
public void renderAscIcon(FacesContext context, UIComponent component) throws IOException{
- renderFacetOrIcon(context, component, "ascIcon", "dr-sdt-sort-asc");
+ renderFacetOrIcon(context, component, "ascIcon", "rich-sdt-sort-asc");
}
public void renderDescIcon(FacesContext context, UIComponent component) throws IOException{
- renderFacetOrIcon(context, component, "descIcon", "dr-sdt-sort-desc");
+ renderFacetOrIcon(context, component, "descIcon", "rich-sdt-sort-desc");
}
private void renderFacetOrIcon(FacesContext context, UIComponent component, String facetName, String clazz) throws IOException{
Modified: branches/community/3.3.X/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js
===================================================================
--- branches/community/3.3.X/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js 2009-05-27 15:22:09 UTC (rev 14377)
+++ branches/community/3.3.X/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js 2009-05-27 15:41:03 UTC (rev 14378)
@@ -128,7 +128,7 @@
fixedWidth: Validators.getBoolean(cell.getAttribute("fixedWidth"), false),
sortable: Validators.getBoolean(cell.getAttribute("sortable"), false),
sorted: Validators.getBoolean(cell.getAttribute("sorted"), "desc"),
- style : Utils.getRule("#"+ this.normalizedId + " .dr-sdt-c-" + j).style
+ style : Utils.getRule("#"+ this.normalizedId + " .rich-sdt-c-" + j).style
};
if(columns[j].sortable)
Event.observe(cell, 'click', eventCellMouseDown);
@@ -168,7 +168,7 @@
fixedWidth: Validators.getBoolean(cell.getAttribute("fixedWidth"), false),
sortable: Validators.getBoolean(cell.getAttribute("sortable"), false),
sorted: null,
- style : Utils.getRule("#"+ this.normalizedId + " .dr-sdt-c-" + (( i < count - 1 ) ? j : "f")).style
+ style : Utils.getRule("#"+ this.normalizedId + " .rich-sdt-c-" + (( i < count - 1 ) ? j : "f")).style
};
if(columns[j].sortable)
@@ -330,7 +330,7 @@
},
OnCellMouseDown: function(event) {
var el = Event.element(event);
- while(el && !Element.hasClassName(el, "dr-sdt-hc")) {
+ while(el && !Element.hasClassName(el, "rich-sdt-header-cell")) {
el = el.parentNode;
}
@@ -433,7 +433,7 @@
});
Object.extend(ClientUI.controls.grid.GridHeader.prototype, {
- sepStyleClass: "dr-sdt-hsep",
+ sepStyleClass: "rich-sdt-hsep",
// internal variables
_columns: []
});
Modified: branches/community/3.3.X/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Selection.js
===================================================================
--- branches/community/3.3.X/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Selection.js 2009-05-27 15:22:09 UTC (rev 14377)
+++ branches/community/3.3.X/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Selection.js 2009-05-27 15:41:03 UTC (rev 14378)
@@ -263,8 +263,6 @@
while(j <= this.selection.ranges[i].indexes[1]) {
var fElement = $(this.prefix + ":f:" + j);
var nElement = $(this.prefix + ":n:" + j);
- Element.addClassName(fElement, "dr-sdt-row-selected");
- Element.addClassName(nElement, "dr-sdt-row-selected");
Element.addClassName(fElement, "rich-sdt-row-selected");
Element.addClassName(nElement, "rich-sdt-row-selected");
Element.addClassName(fElement, this.selectedClass);
@@ -485,8 +483,6 @@
this.selection.addId(rowIndex);
var fElement = $(this.prefix + ":f:" + rowIndex);
var nElement = $(this.prefix + ":n:" + rowIndex);
- Element.addClassName(fElement, "dr-sdt-row-selected");
- Element.addClassName(nElement, "dr-sdt-row-selected");
Element.addClassName(fElement, "rich-sdt-row-selected");
Element.addClassName(nElement, "rich-sdt-row-selected");
Element.addClassName(fElement, this.selectedClass);
@@ -497,8 +493,6 @@
this.selection.removeId(rowIndex);
var fElement = $(this.prefix + ":f:" + rowIndex);
var nElement = $(this.prefix + ":n:" + rowIndex);
- Element.removeClassName(fElement, "dr-sdt-row-selected");
- Element.removeClassName(nElement, "dr-sdt-row-selected");
Element.removeClassName(fElement, "rich-sdt-row-selected");
Element.removeClassName(nElement, "rich-sdt-row-selected");
Element.removeClassName(fElement, this.selectedClass);
@@ -510,8 +504,6 @@
if(this.activeRow != null) {
fElement = $(this.prefix + ":f:" + this.activeRow);
nElement = $(this.prefix + ":n:" + this.activeRow);
- Element.removeClassName(fElement, "dr-sdt-row-active");
- Element.removeClassName(nElement, "dr-sdt-row-active");
Element.removeClassName(fElement, "rich-sdt-row-active");
Element.removeClassName(nElement, "rich-sdt-row-active");
Element.removeClassName(fElement, this.activeClass);
@@ -519,8 +511,6 @@
}
fElement = $(this.prefix + ":f:" + rowIndex);
nElement = $(this.prefix + ":n:" + rowIndex);
- Element.addClassName(fElement, "dr-sdt-row-active");
- Element.addClassName(nElement, "dr-sdt-row-active");
Element.addClassName(fElement, "rich-sdt-row-active");
Element.addClassName(nElement, "rich-sdt-row-active");
Element.addClassName(fElement, this.activeClass);
Modified: branches/community/3.3.X/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss
===================================================================
--- branches/community/3.3.X/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss 2009-05-27 15:22:09 UTC (rev 14377)
+++ branches/community/3.3.X/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss 2009-05-27 15:41:03 UTC (rev 14378)
@@ -6,19 +6,19 @@
<f:verbatim>
- .dr-sdt-sort-asc, .dr-sdt-sort-desc {
+ .rich-sdt-sort-asc, .rich-sdt-sort-desc {
width: 16px;
height: 6px;
background-position: 50% 50%;
background-repeat: no-repeat;
}
- .dr-sdt-sort-icon {
+ .rich-sdt-sort-icon {
position:absolute;
visibility: hidden;
}
- .dr-sdt {
+ .rich-sdt {
padding: 0px 0px;
margin: 0px;
z-index:0;
@@ -32,15 +32,9 @@
*/
/**
- * Header row
- */
- .dr-sdt-hr {
- }
-
- /**
* Header cell
*/
- .dr-sdt-hc {
+ .rich-sdt-header-cell {
-o-text-overflow: ellipsis;
text-overflow: ellipsis;
font-weight: normal;
@@ -51,7 +45,7 @@
border-right-style: solid;
}
- .dr-sdt-hc .sort-asc, .dr-sdt-hc .sort-desc {
+ .rich-sdt-header-cell .sort-asc, .rich-sdt-header-cell .sort-desc {
background-position: right;
background-repeat: no-repeat;
width: 16px !important;;
@@ -62,7 +56,7 @@
/**
* Header cells separator
*/
- .dr-sdt-hsep {
+ .rich-sdt-hsep {
/* background-image: url(grid-split.gif);*/
background-position: center;
background-repeat: repeat-y;
@@ -75,17 +69,17 @@
display: block;
z-index: 60;
}
- .dr-sdt-hsplit {
+ .rich-sdt-hsplit {
width:1px;
border-right: 1px dashed;
cursor: col-resize;
z-index: 100;
}
- .dr-sdt-fb{
+ .rich-sdt-fb{
z-index: 50;
}
- .dr-sdt-nb {
+ .rich-sdt-nb {
z-index: 20;
}
@@ -98,14 +92,14 @@
/**
* Footer row
*/
- .dr-sdt-fr {
+ .rich-std-footer-row {
border-top: 1px solid #cbc7b8; /* //TODO Which skin parameter must be here? */
}
/**
* Footer cell
*/
- .dr-sdt-fc {
+ .rich-sdt-footer-cell {
-o-text-overflow: ellipsis;
text-overflow: ellipsis;
font-weight: normal;
@@ -122,12 +116,7 @@
* ---------------------------------------------
*/
- /**
- * Body cell declaration
- * dr-sdt-bc - reqired
- * dr-sdt-bcDef - default, used if no custom styles defined in body template
- */
- .dr-sdt-bc {
+ .rich-sdt-column-cell {
box-sizing: border-box;
-moz-box-sizing: border-box;
-moz-outline: none;
@@ -139,24 +128,19 @@
/**
* Body row style
*/
- .dr-sdt-ho {
+ .rich-sdt-ho {
position: absolute;
height: 10px;
width: 10px;
}
- .dr-sdt-rb {
+ .rich-sdt-row {
font-weight: normal;
white-space: nowrap;
box-sizing: border-box;
-moz-box-sizing: border-box;
}
- /*
- .dr-sdt-row-active {
- font-weight:bold; //TODO Which skin parameter must be here?
- }
- */
- .dr-sdt-cbody {
+ .rich-sdt-header-cell-body, .rich-sdt-column-cell-body, .rich-sdt-footer-cell-body {
white-space: nowrap;
overflow: hidden;
-o-text-overflow: ellipsis;
@@ -169,7 +153,7 @@
/**
* Helper classes for grid template
*/
- .dr-sdt-substrate {
+ .rich-sdt-substrate {
z-index: 48;
filter:Alpha(opacity=0);
position:absolute;
@@ -178,13 +162,13 @@
display:block;
}
- .dr-sdt-tmplbox {
+ .rich-sdt-fb, .rich-sdt-nb{
display: block;
float:left;
position: absolute;
}
- .dr-sdt-inlinebox {
+ .rich-sdt-inlinebox {
position: relative;
display: block;
overflow: hidden;
@@ -193,15 +177,15 @@
</f:verbatim>
- <u:selector name=".dr-sdt">
+ <u:selector name=".rich-sdt">
<u:style name="background-color" skin="tableBackgroundColor" />
<u:style name="border-color" skin="tableBorderColor" />
<u:style name="border-width" skin="tableBorderWidth" />
</u:selector>
- <u:selector name=".dr-sdt-hr">
+ <u:selector name=".rich-std-header-row">
<u:style name="background-color" skin="headerBackgroundColor" />
</u:selector>
- <u:selector name=".dr-sdt-hc">
+ <u:selector name=".rich-sdt-header-cell">
<u:style name="color" skin="headerTextColor" />
<u:style name="font-family" skin="generalFamilyFont" />
<u:style name="font-size" skin="generalSizeFont" />
@@ -210,40 +194,40 @@
<u:style name="border-right-width" skin="tableBorderWidth" />
<u:style name="border-right-color" skin="tableBorderColor" />
</u:selector>
- <u:selector name=".dr-sdt-hsplit">
+ <u:selector name=".rich-sdt-hsplit">
<u:style name="border-right-color" skin="tipBorderColor" />
</u:selector>
- <u:selector name=".dr-sdt-fr">
+ <u:selector name=".rich-std-footer-row">
<u:style name="background-color" skin="tableSubfooterBackgroundColor" />
</u:selector>
- <u:selector name=".dr-sdt-fc">
+ <u:selector name=".rich-sdt-footer-cell">
<u:style name="border-right-color" skin="tableBorderColor" />
</u:selector>
- <u:selector name=".dr-sdt-bc">
+ <u:selector name=".rich-sdt-column-cell">
<u:style name="border-right-color" skin="tableBorderColor" />
<u:style name="border-bottom-color" skin="tableBorderColor" />
</u:selector>
- <u:selector name=".dr-sdt-row-selected">
+ <u:selector name=".rich-sdt-row-selected">
<u:style name="background-color" skin="additionalBackgroundColor" />
</u:selector>
- <u:selector name=".dr-sdt-row-active">
+ <u:selector name=".rich-sdt-row-active">
<u:style name="color" skin="tabDisabledTextColor" />
</u:selector>
- <u:selector name=".dr-sdt-cbody">
+ <u:selector name=".rich-sdt-header-cell-body, .rich-sdt-column-cell-body, .rich-sdt-footer-cell-body">
<u:style name="font-family" skin="generalFamilyFont" />
<u:style name="font-size" skin="generalSizeFont" />
</u:selector>
- <u:selector name=".dr-sdt-sort-asc">
+ <u:selector name=".rich-sdt-sort-asc">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.html.iconimages.DataTableIconSortAsc"/>
</u:style>
</u:selector>
- <u:selector name=".dr-sdt-sort-desc">
+ <u:selector name=".rich-sdt-sort-desc">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.html.iconimages.DataTableIconSortDesc"/>
</u:style>
</u:selector>
- <u:selector name=".dr-sdt-hsep">
+ <u:selector name=".rich-sdt-hsep">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.html.iconimages.ScrollableDataTableIconSplit"/>
</u:style>
Modified: branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-cell.jspx
===================================================================
--- branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-cell.jspx 2009-05-27 15:22:09 UTC (rev 14377)
+++ branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-cell.jspx 2009-05-27 15:41:03 UTC (rev 14378)
@@ -11,8 +11,8 @@
component="javax.faces.component.UIComponent"
>
- <td class="dr-sdt-bc rich-sdt-column-cell #{columnClass} #{columnSortClass} #{component.attributes['styleClass']}" id="#{client_id}:c_#{cell_id}">
- <div id="#{client_id}:bc_#{cell_id}" class="dr-sdt-cbody dr-sdt-c-#{cell_index} #{component.attributes['cellClass']}" style="#{component.attributes['cellStyle']}">
+ <td class="rich-sdt-column-cell #{columnClass} #{columnSortClass} #{component.attributes['styleClass']}" id="#{client_id}:c_#{cell_id}">
+ <div id="#{client_id}:bc_#{cell_id}" class="rich-sdt-column-cell-body rich-sdt-c-#{cell_index} #{component.attributes['cellClass']}" style="#{component.attributes['cellStyle']}">
<vcp:body/>
</div>
</td>
Modified: branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-footer-cell.jspx
===================================================================
--- branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-footer-cell.jspx 2009-05-27 15:22:09 UTC (rev 14377)
+++ branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-footer-cell.jspx 2009-05-27 15:41:03 UTC (rev 14378)
@@ -11,8 +11,8 @@
component="javax.faces.component.UIComponent"
>
- <th class="dr-sdt-fc rich-sdt-footer-cell #{footerColumnClass} #{footerColumnSortClass} #{component.attributes['footerClass']}">
- <div id="#{client_id}:fc_#{cell_index}" class="dr-sdt-cbody dr-sdt-c-#{cell_index}">
+ <th class="rich-sdt-footer-cell #{footerColumnClass} #{footerColumnSortClass} #{component.attributes['footerClass']}">
+ <div id="#{client_id}:fc_#{cell_index}" class="rich-sdt-footer-cell-body rich-sdt-c-#{cell_index}">
<vcp:body/>
</div>
</th>
Modified: branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-cell.jspx
===================================================================
--- branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-cell.jspx 2009-05-27 15:22:09 UTC (rev 14377)
+++ branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-cell.jspx 2009-05-27 15:41:03 UTC (rev 14378)
@@ -12,7 +12,7 @@
component="javax.faces.component.UIComponent"
>
- <th class="dr-sdt-hc rich-sdt-header-cell #{headerColumnClass} #{headerColumnSortClass}" id="#{client_id}:hc_#{cell_index}" columnid="#{component.attributes['id']}" sortable="#{component.attributes['sortable']}">
+ <th class="rich-sdt-header-cell #{headerColumnClass} #{headerColumnSortClass}" id="#{client_id}:hc_#{cell_index}" columnid="#{component.attributes['id']}" sortable="#{component.attributes['sortable']}">
<jsp:scriptlet>
if(org.richfaces.component.util.ColumnUtil.isSortable(component)) {
@@ -32,7 +32,7 @@
}
</jsp:scriptlet>
- <span column="#{cell_index}" id="#{client_id}:hsep_#{cell_index}" style="left: #{offset}px;" class="dr-sdt-hsep rich-sdt-hsep" />
+ <span column="#{cell_index}" id="#{client_id}:hsep_#{cell_index}" style="left: #{offset}px;" class="rich-sdt-hsep" />
</th>
</f:root>
Modified: branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-itself.jspx
===================================================================
--- branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-itself.jspx 2009-05-27 15:22:09 UTC (rev 14377)
+++ branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-itself.jspx 2009-05-27 15:41:03 UTC (rev 14378)
@@ -12,10 +12,10 @@
component="javax.faces.component.UIComponent"
>
-<div id="#{client_id}:hcb_#{cell_index}" class="dr-sdt-cbody dr-sdt-c-#{cell_index} #{component.attributes['headerClass']}">
+<div id="#{client_id}:hcb_#{cell_index}" class="rich-sdt-header-cell-body rich-sdt-c-#{cell_index} #{component.attributes['headerClass']}">
<vcp:body/>
- <div align="right" id="#{client_id}:hs_#{cell_index}" class="dr-sdt-sort-icon">
+ <div align="right" id="#{client_id}:hs_#{cell_index}" class="rich-sdt-sort-icon">
<c:if test="#{sortAscending}">
<f:call name="renderAscIcon"/>
</c:if>
Modified: branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table.jspx
===================================================================
--- branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table.jspx 2009-05-27 15:22:09 UTC (rev 14377)
+++ branches/community/3.3.X/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table.jspx 2009-05-27 15:41:03 UTC (rev 14378)
@@ -67,7 +67,7 @@
]]>
</jsp:scriptlet>
- <table id="#{clientId}" cellpadding="0" cellspacing="0" style="width: #{component.attributes['width']};height: #{component.attributes['height']};" class="dr-sdt rich-sdt #{component.attributes['styleClass']}" >
+ <table id="#{clientId}" cellpadding="0" cellspacing="0" style="width: #{component.attributes['width']};height: #{component.attributes['height']};" class="rich-sdt #{component.attributes['styleClass']}" >
<tbody>
<jsp:scriptlet>
<![CDATA[
@@ -88,17 +88,17 @@
<tr>
<td id="#{normalizedId}" style="height: 100%;">
<div id="#{clientId}:c" style="height: 100%; position: relative;">
- <div id="#{clientId}:cs" class="dr-sdt-hsplit" style="display: none;"/>
- <div id="#{clientId}_GridHeaderTemplate" class="dr-sdt-inlinebox" style="#{hStyle}; width: #{component.attributes['width']};">
- <iframe id="#{clientId}:hs" class="dr-sdt-substrate" src="javascript:\'\'" scrolling="no" frameborder="0" > <br/> </iframe>
+ <div id="#{clientId}:cs" class="rich-sdt-hsplit" style="display: none;"/>
+ <div id="#{clientId}_GridHeaderTemplate" class="rich-sdt-inlinebox" style="#{hStyle}; width: #{component.attributes['width']};">
+ <iframe id="#{clientId}:hs" class="rich-sdt-substrate" src="javascript:\'\'" scrolling="no" frameborder="0" > <br/> </iframe>
<div style="display: block; left: 0px; top: 0px; width: #{sumWidth}px;">
<style>
<f:call name="renderStyle" />
</style>
- <span class="dr-sdt-tmplbox dr-sdt-fb" id="#{clientId}:header:FrozenBox">
+ <span class="rich-sdt-fb" id="#{clientId}:header:FrozenBox">
<table cellpadding="0" cellspacing="0" style="border-collapse:collapse;">
<thead>
- <tr class="dr-sdt-hr rich-std-header-row #{component.attributes['headerClass']}">
+ <tr class="rich-std-header-row #{component.attributes['headerClass']}">
<jsp:scriptlet>
<![CDATA[
renderHeaders(context, component, true);
@@ -109,17 +109,17 @@
</table>
</span>
- <span class="dr-sdt-tmplbox dr-sdt-nb" id="#{clientId}:header:NormalBox">
+ <span class="rich-sdt-nb" id="#{clientId}:header:NormalBox">
<table cellpadding="0" cellspacing="0" style="border-collapse:collapse;">
<thead>
- <tr class="dr-sdt-hr rich-std-header-row #{component.attributes['headerClass']}">
+ <tr class="rich-std-header-row #{component.attributes['headerClass']}">
<jsp:scriptlet>
<![CDATA[
renderHeaders(context, component, false);
]]>
</jsp:scriptlet>
- <th class="dr-sdt-hc dr-sdt-c-f rich-sdt-header-cell">
- <div class="dr-sdt-cbody" />
+ <th class="rich-sdt-c-f rich-sdt-header-cell">
+ <div class="rich-sdt-header-cell-body" />
</th>
</tr>
</thead>
@@ -130,12 +130,12 @@
- <div id="#{clientId}_GridBodyTemplate" class="dr-sdt-inlinebox" style="overflow: auto; width: #{component.attributes['width']}; height: #{component.attributes['height']};">
+ <div id="#{clientId}_GridBodyTemplate" class="rich-sdt-inlinebox" style="overflow: auto; width: #{component.attributes['width']}; height: #{component.attributes['height']};">
<div id="#{clientId}:scb" style="position: absolute; z-index: 0;">
<div id="#{clientId}:sb" style="position: absolute;" ><br/> </div>
</div>
<div id="#{clientId}:bc" style="display: block; width: #{sumWidth}px;">
- <span class="dr-sdt-tmplbox dr-sdt-fb" id="#{clientId}:body:FrozenBox">
+ <span class="rich-sdt-fb" id="#{clientId}:body:FrozenBox">
<table id="#{clientId}:f" cellpadding="0" cellspacing="0" style="border-collapse:collapse;">
<tbody>
<jsp:scriptlet>
@@ -145,9 +145,9 @@
</jsp:scriptlet>
</tbody>
</table>
- <span class="dr-sdt-ho" id="#{clientId}:fho" ><br/></span>
+ <span class="rich-sdt-ho" id="#{clientId}:fho" ><br/></span>
</span>
- <span class="dr-sdt-tmplbox dr-sdt-nb" id="#{clientId}:body:NormalBox">
+ <span class="rich-sdt-nb" id="#{clientId}:body:NormalBox">
<table id="#{clientId}:n" cellpadding="0" cellspacing="0" style="border-collapse:collapse;">
<tbody>
<jsp:scriptlet>
@@ -157,18 +157,18 @@
</jsp:scriptlet>
</tbody>
</table>
- <span class="dr-sdt-ho" id="#{clientId}:nho" ><br/></span>
+ <span class="rich-sdt-ho" id="#{clientId}:nho" ><br/></span>
</span>
</div>
</div>
- <div id="#{clientId}_GridFooterTemplate" class="dr-sdt-inlinebox" style="#{fStyle}; width: #{component.attributes['width']};">
- <iframe id="#{clientId}:fs" class="dr-sdt-substrate" src="javascript:\'\'" scrolling="no" frameborder="0" > <br/></iframe>
+ <div id="#{clientId}_GridFooterTemplate" class="rich-sdt-inlinebox" style="#{fStyle}; width: #{component.attributes['width']};">
+ <iframe id="#{clientId}:fs" class="rich-sdt-substrate" src="javascript:\'\'" scrolling="no" frameborder="0" > <br/></iframe>
<div style="display: block; width: width: #{sumWidth}px;">
- <span class="dr-sdt-tmplbox dr-sdt-fb" id="#{clientId}:footer:FrozenBox">
+ <span class="rich-sdt-fb" id="#{clientId}:footer:FrozenBox">
<table cellpadding="0" cellspacing="0" style="border-collapse:collapse;">
<tfoot>
- <tr class="dr-sdt-fr rich-std-footer-row #{component.attributes['footerClass']}">
+ <tr class="rich-std-footer-row #{component.attributes['footerClass']}">
<jsp:scriptlet>
<![CDATA[
renderFooters(context, component,true);
@@ -179,17 +179,17 @@
</table>
</span>
- <span class="dr-sdt-tmplbox dr-sdt-nb" id="#{clientId}:footer:NormalBox">
+ <span class="rich-sdt-nb" id="#{clientId}:footer:NormalBox">
<table cellpadding="0" cellspacing="0" style="border-collapse:collapse;">
<tfoot>
- <tr class="dr-sdt-fr rich-std-footer-row #{component.attributes['footerClass']}">
+ <tr class="rich-std-footer-row #{component.attributes['footerClass']}">
<jsp:scriptlet>
<![CDATA[
renderFooters(context, component,false);
]]>
</jsp:scriptlet>
- <th class="dr-sdt-fc dr-sdt-c-f rich-sdt-footer-cell">
- <div class="dr-sdt-cbody" />
+ <th class="rich-sdt-c-f rich-sdt-footer-cell">
+ <div class="rich-sdt-footer-cell-body" />
</th>
</tr>
</tfoot>
Modified: branches/community/3.3.X/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererTest.java
===================================================================
--- branches/community/3.3.X/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererTest.java 2009-05-27 15:22:09 UTC (rev 14377)
+++ branches/community/3.3.X/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererTest.java 2009-05-27 15:41:03 UTC (rev 14378)
@@ -137,7 +137,7 @@
assertEquals("table", div.getNodeName());
String classAttr = div.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-sdt"));
+ assertTrue(classAttr.contains("rich-sdt"));
Iterator childIter= div.getChildElementsIterator();
String id = grid.getId();
@@ -170,14 +170,14 @@
String elemClassAttr = elem.getAttributeValue("class");
res = false;
- if(elemClassAttr.contains("dr-sdt-inlinebox")){
+ if(elemClassAttr.contains("rich-sdt-inlinebox")){
res = true;
- }else if(elemClassAttr.contains("dr-sdt-hsplit")){
+ }else if(elemClassAttr.contains("rich-sdt-hsplit")){
res = true;
}
assertTrue(res);
- if(!elemClassAttr.contains("dr-sdt-hsplit")){
+ if(!elemClassAttr.contains("rich-sdt-hsplit")){
boolean templates = elem.getId().equals(grid.getId()+ "_GridBodyTemplate") || elem.getId().equals(grid.getId()+ "_GridFooterTemplate") || elem.getId().equals(grid.getId()+ "_GridHeaderTemplate");
assertTrue(templates);
@@ -222,9 +222,9 @@
assertNotNull(elemClassAttr);
if(element.getId().contains("FrozenBox")){
- assertTrue(elemClassAttr.contains("dr-sdt-tmplbox dr-sdt-fb"));
+ assertTrue(elemClassAttr.contains("rich-sdt-fb"));
}else if(element.getId().contains("NormalBox")){
- assertTrue(elemClassAttr.contains("dr-sdt-tmplbox dr-sdt-nb"));
+ assertTrue(elemClassAttr.contains("rich-sdt-nb"));
}
@@ -233,13 +233,13 @@
HtmlElement hcell = page.getHtmlElementById(id + ":hc_" + i);
assertNotNull(hcell);
elemClassAttr = hcell.getAttributeValue("class");
- assertTrue(elemClassAttr.contains("dr-sdt-hc rich-sdt-header-cell"));
+ assertTrue(elemClassAttr.contains("rich-sdt-header-cell"));
for (int j = 0; j < grid.getRows(); j++) {
HtmlElement bcell = page.getHtmlElementById(id + ":c_" + j + "_" + i);
assertNotNull(bcell);
elemClassAttr = bcell.getAttributeValue("class");
- assertTrue(elemClassAttr.contains("dr-sdt-bc rich-sdt-column-cell"));
+ assertTrue(elemClassAttr.contains("rich-sdt-column-cell"));
}
}
Modified: branches/community/3.3.X/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/SortIconRendererTest.java
===================================================================
--- branches/community/3.3.X/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/SortIconRendererTest.java 2009-05-27 15:22:09 UTC (rev 14377)
+++ branches/community/3.3.X/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/SortIconRendererTest.java 2009-05-27 15:41:03 UTC (rev 14378)
@@ -107,7 +107,7 @@
assertNotNull(className);
- assertEquals("dr-sdt-sort-asc", className);
+ assertEquals("rich-sdt-sort-asc", className);
} catch (Exception e) {
fail(e.getMessage());
@@ -177,7 +177,7 @@
assertNotNull(className);
- assertEquals("dr-sdt-sort-desc", className);
+ assertEquals("rich-sdt-sort-desc", className);
} catch (Exception e) {
fail(e.getMessage());
14 years, 11 months
JBoss Rich Faces SVN: r14377 - in branches/community/3.3.X/test-applications/regressionArea: regressionArea-tests/src/test/java/org/richfaces/testng/rf5758 and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2009-05-27 11:22:09 -0400 (Wed, 27 May 2009)
New Revision: 14377
Added:
branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf5758/
branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf5758/Test.java
branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf5758.xhtml
Log:
RF-5758 selenium test was added.
Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf5758/Test.java
===================================================================
--- branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf5758/Test.java (rev 0)
+++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf5758/Test.java 2009-05-27 15:22:09 UTC (rev 14377)
@@ -0,0 +1,21 @@
+package org.richfaces.testng.rf5758;
+
+import org.richfaces.SeleniumTestBase;
+
+public class Test extends SeleniumTestBase {
+
+ @org.testng.annotations.Test
+ public void testExecute() throws Exception{
+ renderPage();
+ String str;
+ if((str = selenium.getValue("//form/span/input")).compareTo("Item 45") != 0){
+ throw new AssertionError("Expected: <Item 45>; Actual: <" + str + ">");
+ }
+ }
+
+ @Override
+ public String getTestUrl() {
+ return "pages/rf5758.xhtml";
+ }
+
+}
\ No newline at end of file
Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf5758.xhtml
===================================================================
--- branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf5758.xhtml (rev 0)
+++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf5758.xhtml 2009-05-27 15:22:09 UTC (rev 14377)
@@ -0,0 +1,21 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+
+<ui:composition template="/layout/layout.xhtml">
+ <ui:define name="template">
+ <h:form id="form">
+ <rich:inplaceSelect value="#{45}" id="inplaceSelectID">
+ <f:selectItem itemLabel="Item 1" itemValue="#{1}" />
+ <f:selectItem itemLabel="Item 2" itemValue="#{2}" />
+ <f:selectItem itemLabel="Item 3" itemValue="#{3}" />
+ <f:selectItem itemLabel="Item 45" itemValue="#{45}" />
+ </rich:inplaceSelect>
+ </h:form>
+ </ui:define>
+</ui:composition>
+</html>
\ No newline at end of file
14 years, 11 months
JBoss Rich Faces SVN: r14376 - branches/community/3.3.X/ui/core/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: smukhina
Date: 2009-05-27 11:01:00 -0400 (Wed, 27 May 2009)
New Revision: 14376
Modified:
branches/community/3.3.X/ui/core/src/main/config/component/include.xml
branches/community/3.3.X/ui/core/src/main/config/component/loadStyle.xml
branches/community/3.3.X/ui/core/src/main/config/component/mediaOutput.xml
branches/community/3.3.X/ui/core/src/main/config/component/status.xml
Log:
https://jira.jboss.org/jira/browse/RF-6946 attributes descriptions are corrected
Modified: branches/community/3.3.X/ui/core/src/main/config/component/include.xml
===================================================================
--- branches/community/3.3.X/ui/core/src/main/config/component/include.xml 2009-05-27 14:46:45 UTC (rev 14375)
+++ branches/community/3.3.X/ui/core/src/main/config/component/include.xml 2009-05-27 15:01:00 UTC (rev 14376)
@@ -44,7 +44,7 @@
<property>
<name>viewId</name>
<classname>java.lang.String</classname>
- <description>viewId for included page.</description>
+ <description>Specifies the view id of a page that is included.</description>
</property>
<property>
<name>layout</name>
Modified: branches/community/3.3.X/ui/core/src/main/config/component/loadStyle.xml
===================================================================
--- branches/community/3.3.X/ui/core/src/main/config/component/loadStyle.xml 2009-05-27 14:46:45 UTC (rev 14375)
+++ branches/community/3.3.X/ui/core/src/main/config/component/loadStyle.xml 2009-05-27 15:01:00 UTC (rev 14376)
@@ -34,7 +34,7 @@
<name>src</name>
<classname>java.lang.Object</classname>
<description><![CDATA[
- name of JavaScript resource to load.
+ Defines the context relative path to the style sheet file.
]]>
</description>
</property>
Modified: branches/community/3.3.X/ui/core/src/main/config/component/mediaOutput.xml
===================================================================
--- branches/community/3.3.X/ui/core/src/main/config/component/mediaOutput.xml 2009-05-27 14:46:45 UTC (rev 14375)
+++ branches/community/3.3.X/ui/core/src/main/config/component/mediaOutput.xml 2009-05-27 15:01:00 UTC (rev 14376)
@@ -55,7 +55,7 @@
<property>
<name>usemap</name>
<classname>java.lang.String</classname>
- <description>use client-side image map</description>
+ <description>Specifies an image as a client-side image-map</description>
</property>
<property>
<name>ismap</name>
@@ -84,12 +84,12 @@
<property>
<name>codetype</name>
<classname>java.lang.String</classname>
- <description>content type for code</description>
+ <description>Defines content type for code</description>
</property>
<property>
<name>archive</name>
<classname>java.lang.String</classname>
- <description>space-separated list of URIs</description>
+ <description> Specifies a space-separated list of URIs</description>
</property>
<property>
<name>standby</name>
@@ -135,8 +135,7 @@
<classname>javax.el.MethodExpression</classname>
<description>
<![CDATA[
- Method call expression to send generated resource to OutputStream. It must have two parameter with a type of java.io.OutputStream
- and java.lang.Object ( deserialized value of data attribute )
+ Attribute references to the method that will be used for content creating. The method accepts two parameters. The first parameter has an OutputStream type. It is a reference to the steam that should be used for output. The second parameter is a reference to a 'value' attribute of the component.
]]>
</description>
<methodargs>
@@ -167,7 +166,7 @@
<property>
<name>cacheable</name>
<classname>boolean</classname>
- <description>If "true", the resource is cached (on the server and the client sides).</description>
+ <description>Attribute is a flag that defines the caching strategy. If 'cacheable' is set to false, the response will not be cached. If it is set to true, it will be cached and the serialized value of 'value' attribute plays the role of a cache key.</description>
</property>
<property>
<name>expires</name>
Modified: branches/community/3.3.X/ui/core/src/main/config/component/status.xml
===================================================================
--- branches/community/3.3.X/ui/core/src/main/config/component/status.xml 2009-05-27 14:46:45 UTC (rev 14375)
+++ branches/community/3.3.X/ui/core/src/main/config/component/status.xml 2009-05-27 15:01:00 UTC (rev 14376)
@@ -104,7 +104,7 @@
<name>startText</name>
<classname>java.lang.String</classname>
<description>
- Text for display on starting request.
+ Text to display on starting request.
</description>
</property>
<property>
14 years, 11 months