JBoss Rich Faces SVN: r9733 - trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-07-22 10:40:33 -0400 (Tue, 22 Jul 2008)
New Revision: 9733
Modified:
trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
Log:
RF-3950
Modified: trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
===================================================================
--- trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-07-22 14:40:29 UTC (rev 9732)
+++ trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-07-22 14:40:33 UTC (rev 9733)
@@ -1173,21 +1173,15 @@
},
_flashGetPostParams: function () {
- var params = '';
- var inputs = this.form.elements;
- var l = inputs.length;
- for (var i = 0; i < l; i++) {
- var input = inputs[i];
- if (input.id != (this.id + ':file')) {
- if (input.name == 'javax.faces.ViewState') {
- params = params + '&' + input.name + '=' + input.value.replace(/\+/g,"%2B");
- } else {
- params = params + '&' + input.name + '=' + input.value;
- }
- }
-
+ var query = new A4J.Query('', this.form);
+ if (query) {
+ query.appendFormControls();
+ if (query._query.AJAXREQUEST) {
+ query._query.remove('AJAXREQUEST');
+ }
+ return query.getQueryString();
}
- return params;
+ return '';
},
_flashSubmitForm: function(entry) {
15 years, 10 months
JBoss Rich Faces SVN: r9732 - trunk/framework/impl/src/main/java/org/ajax4jsf/request.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-07-22 10:40:29 -0400 (Tue, 22 Jul 2008)
New Revision: 9732
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/request/MultipartRequest.java
Log:
RF-3950
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/request/MultipartRequest.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/request/MultipartRequest.java 2008-07-22 14:08:37 UTC (rev 9731)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/request/MultipartRequest.java 2008-07-22 14:40:29 UTC (rev 9732)
@@ -24,7 +24,10 @@
import javax.servlet.http.HttpServletRequestWrapper;
import org.ajax4jsf.Filter;
+import org.ajax4jsf.context.AjaxContext;
import org.ajax4jsf.exception.FileUploadException;
+import org.ajax4jsf.webapp.BaseFilter;
+import org.ajax4jsf.webapp.BaseXMLFilter;
/**
* Request wrapper for supporting multipart requests, used for file uploading.
@@ -704,6 +707,15 @@
return params;
}
+
+ @Override
+ public String getHeader(String name) {
+ if (!"Accept".equals(name)) {
+ return super.getHeader(name);
+ }else {
+ return BaseXMLFilter.TEXT_HTML;
+ }
+ }
public void stop() {
shouldStop = true;
15 years, 10 months
JBoss Rich Faces SVN: r9731 - in trunk/sandbox: ui and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-07-22 10:08:37 -0400 (Tue, 22 Jul 2008)
New Revision: 9731
Removed:
trunk/sandbox/samples/state-sample/
trunk/sandbox/ui/state/
Modified:
trunk/sandbox/ui/pom.xml
Log:
state component moved to main build
Modified: trunk/sandbox/ui/pom.xml
===================================================================
--- trunk/sandbox/ui/pom.xml 2008-07-22 14:02:44 UTC (rev 9730)
+++ trunk/sandbox/ui/pom.xml 2008-07-22 14:08:37 UTC (rev 9731)
@@ -13,7 +13,6 @@
<modules>
<module>panel2</module>
<module>simpleTogglePanel2</module>
- <module>state</module>
<module>treeTable</module>
<module>rex-resizable</module>
<module>rex-messageBox</module>
15 years, 10 months
JBoss Rich Faces SVN: r9730 - trunk/ui/core/src/main/resources/org/richfaces/renderkit/html/css.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-07-22 10:02:44 -0400 (Tue, 22 Jul 2008)
New Revision: 9730
Added:
trunk/ui/core/src/main/resources/org/richfaces/renderkit/html/css/basic_both.xcss
trunk/ui/core/src/main/resources/org/richfaces/renderkit/html/css/extended_both.xcss
Log:
skinning resources added
Added: trunk/ui/core/src/main/resources/org/richfaces/renderkit/html/css/basic_both.xcss
===================================================================
--- trunk/ui/core/src/main/resources/org/richfaces/renderkit/html/css/basic_both.xcss (rev 0)
+++ trunk/ui/core/src/main/resources/org/richfaces/renderkit/html/css/basic_both.xcss 2008-07-22 14:02:44 UTC (rev 9730)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<f:template xmlns:f='http:/jsf.exadel.com/template'
+ xmlns:u='http:/jsf.exadel.com/template/util'
+ xmlns="http://www.w3.org/1999/xhtml">
+
+ <f:importResource src="org/richfaces/renderkit/html/css/basic.xcss" />
+ <f:importResource src="org/richfaces/renderkit/html/css/basic_classes.xcss" />
+
+</f:template>
\ No newline at end of file
Added: trunk/ui/core/src/main/resources/org/richfaces/renderkit/html/css/extended_both.xcss
===================================================================
--- trunk/ui/core/src/main/resources/org/richfaces/renderkit/html/css/extended_both.xcss (rev 0)
+++ trunk/ui/core/src/main/resources/org/richfaces/renderkit/html/css/extended_both.xcss 2008-07-22 14:02:44 UTC (rev 9730)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<f:template xmlns:f='http:/jsf.exadel.com/template'
+ xmlns:u='http:/jsf.exadel.com/template/util'
+ xmlns="http://www.w3.org/1999/xhtml">
+
+ <f:importResource src="org/richfaces/renderkit/html/css/extended.xcss" />
+ <f:importResource src="org/richfaces/renderkit/html/css/extended_classes.xcss" />
+
+</f:template>
\ No newline at end of file
15 years, 10 months
JBoss Rich Faces SVN: r9729 - in trunk/samples: state-sample and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-07-22 10:02:11 -0400 (Tue, 22 Jul 2008)
New Revision: 9729
Added:
trunk/samples/state-sample/
Modified:
trunk/samples/pom.xml
trunk/samples/state-sample/pom.xml
Log:
state component moved to main build
Modified: trunk/samples/pom.xml
===================================================================
--- trunk/samples/pom.xml 2008-07-22 14:01:00 UTC (rev 9728)
+++ trunk/samples/pom.xml 2008-07-22 14:02:11 UTC (rev 9729)
@@ -481,6 +481,7 @@
<module>functions-demo</module>
<module>hotKey-sample</module>
<module>beanValidatorSample</module>
+ <module>state-sample</module>
</modules>
</profile>
</profiles>
Copied: trunk/samples/state-sample (from rev 9727, trunk/sandbox/samples/state-sample)
Modified: trunk/samples/state-sample/pom.xml
===================================================================
--- trunk/sandbox/samples/state-sample/pom.xml 2008-07-22 12:15:00 UTC (rev 9727)
+++ trunk/samples/state-sample/pom.xml 2008-07-22 14:02:11 UTC (rev 9729)
@@ -1,7 +1,7 @@
<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.sandbox</groupId>
+ <groupId>org.richfaces</groupId>
<version>3.2.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -14,15 +14,10 @@
</build>
<dependencies>
<dependency>
- <groupId>org.richfaces.sandbox.ui</groupId>
+ <groupId>org.richfaces.ui</groupId>
<artifactId>state</artifactId>
<version>3.2.2-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui</artifactId>
- <version>3.2.2-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.richfaces.samples</groupId>
<artifactId>skins</artifactId>
15 years, 10 months
JBoss Rich Faces SVN: r9728 - in trunk/ui: beanValidator and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-07-22 10:01:00 -0400 (Tue, 22 Jul 2008)
New Revision: 9728
Added:
trunk/ui/state/
Modified:
trunk/ui/beanValidator/
trunk/ui/pom.xml
trunk/ui/state/pom.xml
Log:
state component moved to main build
Property changes on: trunk/ui/beanValidator
___________________________________________________________________
Name: svn:ignore
+ .classpath
.project
.settings
target
Modified: trunk/ui/pom.xml
===================================================================
--- trunk/ui/pom.xml 2008-07-22 12:15:00 UTC (rev 9727)
+++ trunk/ui/pom.xml 2008-07-22 14:01:00 UTC (rev 9728)
@@ -128,6 +128,7 @@
<module>functions</module>
<module>hotKey</module>
<module>beanValidator</module>
+ <module>state</module>
</modules>
<dependencies>
<dependency>
Copied: trunk/ui/state (from rev 9727, trunk/sandbox/ui/state)
Modified: trunk/ui/state/pom.xml
===================================================================
--- trunk/sandbox/ui/state/pom.xml 2008-07-22 12:15:00 UTC (rev 9727)
+++ trunk/ui/state/pom.xml 2008-07-22 14:01:00 UTC (rev 9728)
@@ -1,11 +1,11 @@
<?xml version="1.0"?><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>ui</artifactId>
- <groupId>org.richfaces.sandbox</groupId>
+ <groupId>org.richfaces</groupId>
<version>3.2.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.sandbox.ui</groupId>
+ <groupId>org.richfaces.ui</groupId>
<artifactId>state</artifactId>
<name>state</name>
<build>
15 years, 10 months
JBoss Rich Faces SVN: r9727 - in trunk: ui/menu-components/src/main/config/component and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: smukhina
Date: 2008-07-22 08:15:00 -0400 (Tue, 22 Jul 2008)
New Revision: 9727
Modified:
trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_table_attributes.ent
trunk/ui/menu-components/src/main/config/component/menucomponents.xml
Log:
http://jira.jboss.com/jira/browse/RF-696
Tables of attributes, correcting attributes descriptions
Modified: trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_table_attributes.ent
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_table_attributes.ent 2008-07-22 09:14:14 UTC (rev 9726)
+++ trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_table_attributes.ent 2008-07-22 12:15:00 UTC (rev 9727)
@@ -3,7 +3,7 @@
<name>align</name>
<classname>java.lang.String</classname>
<description> Deprecated. This attribute specifies the position of the table with respect to the document.
- The possible values are "left", "center" and "right".
+ The possible values are "left", "center" and "right". The default value is "left".
</description>
</property>
<property>
Modified: trunk/ui/menu-components/src/main/config/component/menucomponents.xml
===================================================================
--- trunk/ui/menu-components/src/main/config/component/menucomponents.xml 2008-07-22 09:14:14 UTC (rev 9726)
+++ trunk/ui/menu-components/src/main/config/component/menucomponents.xml 2008-07-22 12:15:00 UTC (rev 9727)
@@ -213,7 +213,7 @@
<property>
<name>disabled</name>
<classname>boolean</classname>
- <description>If "true" sets state of the item to disabled state. . Default value is "false".
+ <description>If "true" sets state of the item to disabled state. Default value is "false".
</description>
<defaultvalue>false</defaultvalue>
</property>
15 years, 10 months
JBoss Rich Faces SVN: r9726 - in trunk/sandbox/ui/extendedDataTable/src/main: javascript/ClientUI/controls/datatable and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: pkawiak
Date: 2008-07-22 05:14:14 -0400 (Tue, 22 Jul 2008)
New Revision: 9726
Modified:
trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedTableRenderer.java
trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js
trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableHeader.js
trunk/sandbox/ui/extendedDataTable/src/main/resources/org/richfaces/renderkit/html/css/extendedDataTable.xcss
Log:
Preventing overlapping icons; IE6 lack of hover fix.
Modified: trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedTableRenderer.java
===================================================================
--- trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedTableRenderer.java 2008-07-22 08:21:18 UTC (rev 9725)
+++ trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedTableRenderer.java 2008-07-22 09:14:14 UTC (rev 9726)
@@ -1607,8 +1607,10 @@
// menu
if ("header".equals(facetName)) {
writer.startElement(HTML.DIV_ELEM, column);
+ String menuDivId = clientId + ":menuDiv";
+ writer.writeAttribute(HTML.id_ATTRIBUTE, menuDivId, null);
writer.writeAttribute(HTML.class_ATTRIBUTE,
- "extdt-menu-div", null);
+ "extdt-menu-div-out", null);
writer.endElement(HTML.DIV_ELEM);
}
Modified: trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js
===================================================================
--- trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js 2008-07-22 08:21:18 UTC (rev 9725)
+++ trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js 2008-07-22 09:14:14 UTC (rev 9726)
@@ -312,10 +312,10 @@
header.adjustSeparators();
this.hideSplashScreen();
},
- update: function(refreshEvents) {
- this.createControls();
- if ( !ClientUILib.isIE ) {
- if (this.fakeIeRow) {
+ update: function(refreshEvents) {
+ this.createControls();
+ if ( !ClientUILib.isIE ) {
+ if (this.fakeIeRow) {
this.table.getElement().deleteRow(this.fakeIeRow);
this.fakeIeRow = null;
}
Modified: trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableHeader.js
===================================================================
--- trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableHeader.js 2008-07-22 08:21:18 UTC (rev 9725)
+++ trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableHeader.js 2008-07-22 09:14:14 UTC (rev 9726)
@@ -12,7 +12,9 @@
this.eventSepClick = this.OnSepClick.bindAsEventListener(this);
this.eventSepMouseDown = this.OnSepMouseDown.bindAsEventListener(this);
this.eventSepMouseMove = this.OnSepMouseMove.bindAsEventListener(this);
- this.eventSepMouseUp = this.OnSepMouseUp.bindAsEventListener(this);
+ this.eventSepMouseUp = this.OnSepMouseUp.bindAsEventListener(this);
+ this.eventHeaderCellMouseOver = this.OnHeaderCellMouseOver.bindAsEventListener(this);
+ this.eventHeaderCellMouseOut = this.OnHeaderCellMouseOut.bindAsEventListener(this);
var showMenuFct = this.extDt.options.showMenuFunction;
if (showMenuFct) {
@@ -22,6 +24,19 @@
this.createControl(elementId);
},
+
+ OnHeaderCellMouseOver: function(event) {
+ var el = this.extDt._findParentElement(event, "th");
+ var menuDiv = $(el.id+"header:menuDiv");
+ menuDiv.className = "extdt-menu-div-on";
+ },
+
+ OnHeaderCellMouseOut: function(event) {
+ var el = this.extDt._findParentElement(event, "th");
+ var menuDiv = $(el.id+"header:menuDiv");
+ menuDiv.className = "extdt-menu-div-out";
+ },
+
getVisibleWidth: function() {
var sum = 0;
for(var i=0; i<this.getColumnsNumber()-1; i++){
@@ -42,6 +57,9 @@
}
this.adjustSeparators();
},
+
+
+
parseTemplate: function(template) {
if(!template) {
return false;
@@ -124,8 +142,11 @@
//remove listeners
Utils.DOM.Event.removeListeners(menuImage);
+ Utils.DOM.Event.removeListeners(headerChild);
Utils.DOM.Event.removeListeners(sepSpan);
//add listeners
+ Utils.DOM.Event.observe(headerChild,'mouseover',this.eventHeaderCellMouseOver);
+ Utils.DOM.Event.observe(headerChild,'mouseout',this.eventHeaderCellMouseOut);
Utils.DOM.Event.observe(menuImage,'click',this.menuImageMouseDown);
Utils.DOM.Event.observe(sepSpan, 'click', this.eventSepClick);
Utils.DOM.Event.observe(sepSpan, 'mousedown', this.eventSepMouseDown);
Modified: trunk/sandbox/ui/extendedDataTable/src/main/resources/org/richfaces/renderkit/html/css/extendedDataTable.xcss
===================================================================
--- trunk/sandbox/ui/extendedDataTable/src/main/resources/org/richfaces/renderkit/html/css/extendedDataTable.xcss 2008-07-22 08:21:18 UTC (rev 9725)
+++ trunk/sandbox/ui/extendedDataTable/src/main/resources/org/richfaces/renderkit/html/css/extendedDataTable.xcss 2008-07-22 09:14:14 UTC (rev 9726)
@@ -62,23 +62,24 @@
.extdt-dr-menucell{
}
-
- .extdt-dr-menucell: hover{
- background-position: center right;
- background-repeat: no-repeat;
- }
.extdt-maindiv {
background-repeat:no-repeat;
background-position:center;
}
- .extdt-menu-div {
+ .extdt-menu-div-out {
height: 23px;
position: absolute;
width: 20px;
}
+ .extdt-menu-div-on {
+ height: 23px;
+ position: absolute;
+ width: 20px;
+ }
+
.extdt-group-row {
height: 15px;
}
@@ -290,9 +291,10 @@
</f:verbatim>
-<u:selector name=".extdt-menu-div" >
- <u:style name="background-image">
- <f:resource f:key="/org/richfaces/renderkit/html/images/s.gif"/>
+<u:selector name=".extdt-menu-div-on" >
+ <u:style name="background">
+ <f:verbatim skin="additionalBackgroundColor"/>
+ <f:resource f:key="/org/richfaces/renderkit/html/images/menuHover.gif"/>
</u:style>
</u:selector>
@@ -322,12 +324,6 @@
<u:style name="border-collapse" value="collapse" />
</u:selector>
-<u:selector name=".extdt-dr-menucell: hover">
- <u:style name="background-image">
- <f:resource f:key="/org/richfaces/renderkit/html/images/menuHover.gif"/>
- </u:style>
-</u:selector>
-
<u:selector name=".extdt-maindiv">
<u:style name="border" value="solid"> <!--tableBorderColor-->
<f:verbatim skin="tableBorderWidth" />
15 years, 10 months
JBoss Rich Faces SVN: r9725 - in trunk/ui/dataTable/src/main/java/org/richfaces: renderkit and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: dmorozov
Date: 2008-07-22 04:21:18 -0400 (Tue, 22 Jul 2008)
New Revision: 9725
Modified:
trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
Log:
Fix tbody rendering. in data table
Modified: trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java 2008-07-21 19:21:34 UTC (rev 9724)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java 2008-07-22 08:21:18 UTC (rev 9725)
@@ -191,24 +191,28 @@
}
@Override
- public void encodeAjaxChild(FacesContext context,
- String path,Set<String> ids,Set<String> renderedAreas) throws IOException {
-
- if (this.isRendered()) {
- Renderer renderer = this.getRenderer(context);
- if (renderer instanceof AbstractTableRenderer) {
- AbstractTableRenderer r = (AbstractTableRenderer) renderer;
- AjaxContext ajaxContext = AjaxContext.getCurrentInstance(context);
- r.encodeTBodyAjax(context, this);
- ajaxContext.getAjaxRenderedAreas().add(this.getClientId(context) + ":tb");
- }
-
- AjaxChildrenRenderer childrenRenderer = getChildrenRenderer();
- String childsPath = path + getId() + NamingContainer.SEPARATOR_CHAR;
- for (UIComponent component : getFacets().values()) {
- childrenRenderer.encodeAjaxComponent(context, component, childsPath, ids, renderedAreas);
- }
- }
+ public void encodeAjaxChild(FacesContext context, String path, Set<String> ids, Set<String> renderedAreas) throws IOException {
+
+ boolean encodeChildren = true;
+ Renderer renderer = this.getRenderer(context);
+ if (renderer instanceof AbstractTableRenderer) {
+ AbstractTableRenderer r = (AbstractTableRenderer) renderer;
+ if (r.renderBodyOnly(context, this)) {
+ AjaxContext ajaxContext = AjaxContext.getCurrentInstance(context);
+ r.encodeTBodyAjax(context, this);
+ ajaxContext.getAjaxRenderedAreas().add(this.getClientId(context) + ":tb");
+ encodeChildren = false;
+ }
+ }
+
+ AjaxChildrenRenderer childrenRenderer = getChildrenRenderer();
+ if (encodeChildren) {
+ childrenRenderer.encodeAjaxChildren(context, this, path, ids, renderedAreas);
+ } else {
+ String childsPath = path + getId() + NamingContainer.SEPARATOR_CHAR;
+ for (UIComponent component : getFacets().values()) {
+ childrenRenderer.encodeAjaxComponent(context, component, childsPath, ids, renderedAreas);
+ }
+ }
}
-
}
\ No newline at end of file
Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-07-21 19:21:34 UTC (rev 9724)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-07-22 08:21:18 UTC (rev 9725)
@@ -72,6 +72,11 @@
writer.endElement("tbody");
}
+ @Override
+ public void encodeChildren(FacesContext context, UIComponent component) throws IOException {
+ encodeTBody(context, (UIDataTable) component);
+ }
+
/**
* Helper method for rendering data table tBody only.
* For HTML consistency it wrap tBody with extra fake "table" tag
@@ -87,6 +92,17 @@
}
/**
+ * Check whether to render tbody only by Ajax call
+ * @param context
+ * @param table
+ * @return data table tBody only should be rendered
+ */
+ public boolean renderBodyOnly(FacesContext context, UIDataTable table) {
+ Map<String, String> map = context.getExternalContext().getRequestParameterMap();
+ return table.isRendered() && SORT_FILTER_PARAMETER.equals(map.get(table.getClientId(context)));
+ }
+
+ /**
* Encode all table structure - colgroups definitions, caption, header,
* footer
*
15 years, 10 months
JBoss Rich Faces SVN: r9724 - in trunk/framework/api/src/main/java/org/ajax4jsf: renderkit and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-07-21 15:21:34 -0400 (Mon, 21 Jul 2008)
New Revision: 9724
Added:
trunk/framework/api/src/main/java/org/ajax4jsf/renderkit/HeaderResourceProducer2.java
trunk/framework/api/src/main/java/org/ajax4jsf/renderkit/UserResourceRenderer2.java
Modified:
trunk/framework/api/src/main/java/org/ajax4jsf/context/AjaxContext.java
trunk/framework/api/src/main/java/org/ajax4jsf/resource/InternetResourceBuilder.java
Log:
Encoding for InternetResource implemented
Modified: trunk/framework/api/src/main/java/org/ajax4jsf/context/AjaxContext.java
===================================================================
--- trunk/framework/api/src/main/java/org/ajax4jsf/context/AjaxContext.java 2008-07-21 19:21:27 UTC (rev 9723)
+++ trunk/framework/api/src/main/java/org/ajax4jsf/context/AjaxContext.java 2008-07-21 19:21:34 UTC (rev 9724)
@@ -16,14 +16,13 @@
public abstract class AjaxContext {
- public static final String SCRIPTS_PARAMETER = "org.ajax4jsf.framework.HEADER_SCRIPTS";
- public static final String STYLES_PARAMETER = "org.ajax4jsf.framework.HEADER_STYLES";
- public static final String USER_STYLES_PARAMETER = "org.ajax4jsf.framework.HEADER_USER_STYLES";
public static final String RESPONSE_DATA_KEY = "_ajax:data";
static final String SERVICE_RESOURCE = "META-INF/services/"
+ AjaxContext.class.getName();
private static final String DEFAULT_CONTEXT_CLASS = "org.ajax4jsf.context.AjaxContextImpl";
+ public static final String HEAD_EVENTS_PARAMETER = "org.ajax4jsf.framework.HEAD_EVENTS_LIST";
+
/**
* Key for keep request state information in request-scope attributes.
*/
Added: trunk/framework/api/src/main/java/org/ajax4jsf/renderkit/HeaderResourceProducer2.java
===================================================================
--- trunk/framework/api/src/main/java/org/ajax4jsf/renderkit/HeaderResourceProducer2.java (rev 0)
+++ trunk/framework/api/src/main/java/org/ajax4jsf/renderkit/HeaderResourceProducer2.java 2008-07-21 19:21:34 UTC (rev 9724)
@@ -0,0 +1,42 @@
+/**
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.ajax4jsf.renderkit;
+
+import java.io.IOException;
+import java.util.Set;
+
+import javax.faces.context.FacesContext;
+
+import org.ajax4jsf.resource.InternetResource;
+
+/**
+ * Interface for renderers, for wich nessesary insert script or style resource in header.
+ * This is the second revision of {@link HeaderResourceProducer} interface that returns
+ * arrays of {@link InternetResource} instead of {@link Set}
+ * @author nbelaevski(a)exadel.com
+ *
+ */
+public interface HeaderResourceProducer2 extends HeaderResourceProducer {
+
+ public void encodeToHead(FacesContext context, boolean processStyles,
+ boolean processScripts) throws IOException;
+}
Added: trunk/framework/api/src/main/java/org/ajax4jsf/renderkit/UserResourceRenderer2.java
===================================================================
--- trunk/framework/api/src/main/java/org/ajax4jsf/renderkit/UserResourceRenderer2.java (rev 0)
+++ trunk/framework/api/src/main/java/org/ajax4jsf/renderkit/UserResourceRenderer2.java 2008-07-21 19:21:34 UTC (rev 9724)
@@ -0,0 +1,20 @@
+package org.ajax4jsf.renderkit;
+
+import java.util.Set;
+
+import javax.faces.context.FacesContext;
+
+import org.ajax4jsf.resource.InternetResource;
+
+/**
+ * Marker interface for a user-defined resources for a HTML HEAD tag.
+ * There resourses must be loaded AFTER all other components.
+ * This is the second revision of {@link UserResourceRenderer} interface that returns
+ * arrays of {@link InternetResource} instead of {@link Set}
+ * @author nbelaevski(a)exadel.com
+ *
+ */
+public interface UserResourceRenderer2 extends UserResourceRenderer {
+
+ public void encodeToHead(FacesContext context);
+}
Modified: trunk/framework/api/src/main/java/org/ajax4jsf/resource/InternetResourceBuilder.java
===================================================================
--- trunk/framework/api/src/main/java/org/ajax4jsf/resource/InternetResourceBuilder.java 2008-07-21 19:21:27 UTC (rev 9723)
+++ trunk/framework/api/src/main/java/org/ajax4jsf/resource/InternetResourceBuilder.java 2008-07-21 19:21:34 UTC (rev 9724)
@@ -53,12 +53,6 @@
public static final String STD_CONTROLS_SKINNING_CLASSES_PARAM = "org.richfaces.CONTROL_SKINNING_CLASSES";
public static final String ENABLE = "enable";
- public static final String STD_CONTROLS_BASIC_STYLE = "/org/richfaces/renderkit/html/css/basic.xcss";
- public static final String STD_CONTROLS_BASIC_CLASSES_STYLE = "/org/richfaces/renderkit/html/css/basic_classes.xcss";
-
- public static final String STD_CONTROLS_EXTENDED_STYLE = "/org/richfaces/renderkit/html/css/extended.xcss";
- public static final String STD_CONTROLS_EXTENDED_CLASSES_STYLE = "/org/richfaces/renderkit/html/css/extended_classes.xcss";
-
/**
* Get application start time for check resources modification time.
*
@@ -203,4 +197,5 @@
super();
}
+ public abstract ResourceRenderer getRenderer(String name);
}
\ No newline at end of file
15 years, 10 months