JBoss Rich Faces SVN: r5144 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2008-01-04 11:25:25 -0500 (Fri, 04 Jan 2008)
New Revision: 5144
Modified:
trunk/docs/userguide/en/src/main/docbook/included/form.xml
Log:
http://jira.jboss.com/jira/browse/RF-1813 - done
Modified: trunk/docs/userguide/en/src/main/docbook/included/form.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/form.xml 2008-01-04 16:23:33 UTC (rev 5143)
+++ trunk/docs/userguide/en/src/main/docbook/included/form.xml 2008-01-04 16:25:25 UTC (rev 5144)
@@ -53,12 +53,17 @@
<section>
<title>Key attributes and ways of usage</title>
<para>The difference with the original component is that all hidden fields required for command links are always rendered and it doesn't depend on links rendering on the initial page. It solves the problem with invalid links that weren't rendered on a page immediately, but after some Ajax request.</para>
- <para>Beginning with release 1.0.5 additional attributes that make this form variant universal have appeared. With a new attribute definition as ajax=<emphasis >
- <property>"true"</property>
- </emphasis>, it becomes possible to set Ajax submission way for any components inside, i.e. not a page URL is used as an <emphasis >
- <property>"action"</property>
- </emphasis> attribute, but the javascript:A4J.AJAX.Submit(...) call. In this case, rendering is defined as "reRender"=list of Ids for the form element itself.</para>
- <para>Example</para>
+ <para>Beginning with release 1.0.5 additional attributes that make this form variant universal have appeared.
+ </para>
+ <para>
+ If <emphasis><property>"ajaxSubmit"</property></emphasis> attribute is true,
+ it becomes possible to set Ajax submission way for any components inside,
+ i.e. not a page URL is used as an <emphasis><property>"action"</property></emphasis> attribute, but the javascript:A4J.AJAX.Submit(...) call.
+ In this case, the <emphasis><property>"reRender"</property></emphasis> attribute contains a list of Ids of components defined for re-rendering.
+ If you have <emphasis role="bold"><property><h:commandButton></property></emphasis> or
+ <emphasis role="bold"><property><h:commandLink></property></emphasis> inside the form, they work as <emphasis role="bold"><property><a4j:commandButton></property></emphasis>.
+ </para>
+ <para><emphasis role="bold">Example:</emphasis></para>
<programlisting role="XML"><![CDATA[<a4j:form id="helloForm" ajaxSubmit="true" reRender="table">
...
<t:dataTable id="table"... >
@@ -81,7 +86,13 @@
<property><h:commandLink></property>
</emphasis> and can't be made Ajax ones with using e.g. <emphasis role="bold">
<property><a4j:support></property>
- </emphasis>.</para>
+ </emphasis>.
+</para>
+ <para>
+ With the help of <emphasis><property>"limitToList"</property></emphasis> attribute you can limit areas, which are updated after the responses.
+ If <emphasis><property>"limitToList"</property></emphasis> is true, only the reRender attribute is taken in account.
+ Therefore, if you use blocks of text wrapped with <emphasis role="bold"><property><a4j:outputPanel></property></emphasis> and <emphasis><property>"ajaxRendered"</property></emphasis>= <property>true</property>, blocks of text are ignored.
+ </para>
</section>
<section>
<title>Relevant resources links</title>
16 years, 3 months
JBoss Rich Faces SVN: r5143 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2008-01-04 11:23:33 -0500 (Fri, 04 Jan 2008)
New Revision: 5143
Modified:
trunk/docs/userguide/en/src/main/docbook/included/virtualEarth.xml
Log:
http://jira.jboss.com/jira/browse/RF-1814 - done
Modified: trunk/docs/userguide/en/src/main/docbook/included/virtualEarth.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/virtualEarth.xml 2008-01-04 16:23:04 UTC (rev 5142)
+++ trunk/docs/userguide/en/src/main/docbook/included/virtualEarth.xml 2008-01-04 16:23:33 UTC (rev 5143)
@@ -130,7 +130,18 @@
<listitem> onmouseout </listitem>
<listitem> etc. </listitem>
</itemizedlist>
-
+
+ <note>
+ <para>
+ Virtual Earth does not support XHTML format of the page.
+ Thus, if you use Facelets and JSF 1.2, do not forget to put the following tags somewhere on the page:
+ </para>
+ <programlisting role="XML"><![CDATA[...
+<f:view contentType="text/html">...</f:view>
+...
+]]></programlisting>
+ </note>
+
</section>
<section>
<title>Look-and-Feel Customization</title>
16 years, 3 months
JBoss Rich Faces SVN: r5142 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2008-01-04 11:23:04 -0500 (Fri, 04 Jan 2008)
New Revision: 5142
Modified:
trunk/docs/userguide/en/src/main/docbook/included/gmap.xml
Log:
http://jira.jboss.com/jira/browse/RF-1814 - done
Modified: trunk/docs/userguide/en/src/main/docbook/included/gmap.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/gmap.xml 2008-01-04 14:38:52 UTC (rev 5141)
+++ trunk/docs/userguide/en/src/main/docbook/included/gmap.xml 2008-01-04 16:23:04 UTC (rev 5142)
@@ -153,7 +153,18 @@
<listitem> onmouseout </listitem>
<listitem> etc. </listitem>
</itemizedlist>
-
+
+ <note>
+ <para>
+ Google Map does not support XHTML format of the page.
+ Thus, if you use Facelets and JSF 1.2, do not forget to put the following tags somewhere on the page:
+ </para>
+ <programlisting role="XML"><![CDATA[...
+<f:view contentType="text/html">...</f:view>
+...
+]]></programlisting>
+ </note>
+
</section>
<section>
<title>Look-and-Feel Customization</title>
16 years, 3 months
JBoss Rich Faces SVN: r5141 - trunk/sandbox/ui/combobox/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-01-04 09:38:52 -0500 (Fri, 04 Jan 2008)
New Revision: 5141
Modified:
trunk/sandbox/ui/combobox/src/main/config/component/combobox.xml
Log:
add new attributes according to specification
Modified: trunk/sandbox/ui/combobox/src/main/config/component/combobox.xml
===================================================================
--- trunk/sandbox/ui/combobox/src/main/config/component/combobox.xml 2008-01-04 14:38:20 UTC (rev 5140)
+++ trunk/sandbox/ui/combobox/src/main/config/component/combobox.xml 2008-01-04 14:38:52 UTC (rev 5141)
@@ -30,55 +30,185 @@
<properties>
<property>
<name>suggestionValues</name>
- <classname>java.util.List</classname>
+ <classname>java.lang.Object</classname>
</property>
- </properties>
- <property>
- <name>filterNewValues</name>
- <classname>java.lang.Boolean</classname>
- <description></description>
- <defaultvalue>true</defaultvalue>
- </property>
- <property>
- <name>directInputSuggestions</name>
- <classname>java.lang.Boolean</classname>
- <description></description>
- <defaultvalue>true</defaultvalue>
- </property>
-
- <property>
- <name>defaultMessage</name>
- <classname>java.lang.String</classname>
- <description></description>
- </property>
-
- <property>
- <name>listWidth</name>
- <classname>java.lang.String</classname>
- <description></description>
- </property>
- <property>
- <name>listHeight</name>
- <classname>java.lang.String</classname>
- <description></description>
- </property>
- <property>
- <name>inputSize</name>
- <classname>java.lang.String</classname>
- <description></description>
- </property>
-
- <property>
- <name>onlistcall</name>
- <classname>java.lang.String</classname>
- <description></description>
- <defaultvalue><![CDATA[""]]></defaultvalue>
- </property>
- <property>
- <name>onselected</name>
- <classname>java.lang.String</classname>
- <description></description>
- <defaultvalue><![CDATA[""]]></defaultvalue>
- </property>
+ <property>
+ <name>selectFirstOnUpdate</name>
+ <classname>boolean</classname>
+ <defaultvalue>true</defaultvalue>
+ </property>
+ <property>
+ <name>filterNewValues</name>
+ <classname>java.lang.Boolean</classname>
+ <description></description>
+ <defaultvalue>true</defaultvalue>
+ </property>
+ <property>
+ <name>directInputSuggestions</name>
+ <classname>java.lang.Boolean</classname>
+ <description></description>
+ <defaultvalue>true</defaultvalue>
+ </property>
+ <property>
+ <name>defaultMessage</name>
+ <classname>java.lang.String</classname>
+ <description></description>
+ </property>
+
+ <property>
+ <name>listWidth</name>
+ <classname>java.lang.String</classname>
+ <description></description>
+ </property>
+ <property>
+ <name>listHeight</name>
+ <classname>java.lang.String</classname>
+ <description></description>
+ </property>
+ <property>
+ <name>inputSize</name>
+ <classname>java.lang.String</classname>
+ <description></description>
+ </property>
+ <property>
+ <name>onchange</name>
+ <classname>java.lang.String</classname>
+ <description></description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
+ <name>onlistcall</name>
+ <classname>java.lang.String</classname>
+ <description></description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
+ <name>onitemselected</name>
+ <classname>java.lang.String</classname>
+ <description></description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
+ <name>disable</name>
+ <classname>boolean</classname>
+ <description>make component disabled</description>
+ <defaultvalue>false</defaultvalue>
+ </property>
+ <property>
+ <name>buttonIcon</name>
+ <classname>java.lang.String</classname>
+ <description>URI</description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
+ <name>buttonIconDisabled</name>
+ <classname>java.lang.String</classname>
+ <description>URI</description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
+ <name>defaultLabel</name>
+ <classname>java.lang.String</classname>
+ <description></description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
+ <name>listStyle</name>
+ <classname>java.lang.String</classname>
+ <description></description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
+ <name>listClass</name>
+ <classname>java.lang.String</classname>
+ <description></description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
+ <name>inputStyle</name>
+ <classname>java.lang.String</classname>
+ <description></description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
+ <name>inputClass</name>
+ <classname>java.lang.String</classname>
+ <description></description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
+ <name>itemStyle</name>
+ <classname>java.lang.String</classname>
+ <description></description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
+ <name>itemClass</name>
+ <classname>java.lang.String</classname>
+ <description></description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
+ <name>itemDisabledStyle</name>
+ <classname>java.lang.String</classname>
+ <description></description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
+ <name>itemDisabledClass</name>
+ <classname>java.lang.String</classname>
+ <description></description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
+ <name>itemSelectedStyle</name>
+ <classname>java.lang.String</classname>
+ <description></description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
+ <name>itemSelectedClass</name>
+ <classname>java.lang.String</classname>
+ <description></description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
+ <name>buttonStyle</name>
+ <classname>java.lang.String</classname>
+ <description></description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
+ <name>buttonClass</name>
+ <classname>java.lang.String</classname>
+ <description></description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
+ <name>buttonDisabledStyle</name>
+ <classname>java.lang.String</classname>
+ <description></description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
+ <name>buttonDisabledClass</name>
+ <classname>java.lang.String</classname>
+ <description></description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
+ <name>style</name>
+ <classname>java.lang.String</classname>
+ <description></description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
+ <name>styleClass</name>
+ <classname>java.lang.String</classname>
+ <description></description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ &html_events;
+ </properties>
</component>
</components>
16 years, 3 months
JBoss Rich Faces SVN: r5140 - trunk/sandbox/ui/combobox/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-01-04 09:38:20 -0500 (Fri, 04 Jan 2008)
New Revision: 5140
Modified:
trunk/sandbox/ui/combobox/src/main/java/org/richfaces/component/UIComboBox.java
Log:
suggestionValues - Object
Modified: trunk/sandbox/ui/combobox/src/main/java/org/richfaces/component/UIComboBox.java
===================================================================
--- trunk/sandbox/ui/combobox/src/main/java/org/richfaces/component/UIComboBox.java 2008-01-04 14:37:59 UTC (rev 5139)
+++ trunk/sandbox/ui/combobox/src/main/java/org/richfaces/component/UIComboBox.java 2008-01-04 14:38:20 UTC (rev 5140)
@@ -3,20 +3,17 @@
*/
package org.richfaces.component;
-import java.util.List;
-
import javax.faces.component.UIInput;
/**
* UI implementation of ComboBox component
* @author Anton Belevich
- *
+ * @since 3.2.0
*/
-//TODO add @since declaration to newly-created classes
+
public abstract class UIComboBox extends UIInput {
- //TODO should be Object, can be Collection of objects or array
- public abstract List <String> getSuggestionValues();
- public abstract void setSuggestionValues( List value);
+ public abstract Object getSuggestionValues();
+ public abstract void setSuggestionValues(Object value);
}
16 years, 3 months
JBoss Rich Faces SVN: r5139 - trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-01-04 09:37:59 -0500 (Fri, 04 Jan 2008)
New Revision: 5139
Modified:
trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java
Log:
remove Collection.sort, suggestionValues now Collection of objects or array
Modified: trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java
===================================================================
--- trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java 2008-01-04 14:36:51 UTC (rev 5138)
+++ trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java 2008-01-04 14:37:59 UTC (rev 5139)
@@ -1,9 +1,7 @@
package org.richfaces.renderkit;
import java.io.IOException;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
+import java.util.Collection;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -19,56 +17,39 @@
/**
* @author Anton Belevich
- *
+ * @since 3.2.0
+ * ComboBox Base renderer implementation
+ *
*/
public class ComboBoxBaseRenderer extends HeaderResourcesRendererBase {
-//
-// private static final String INPUT = "_input";
-//
-// private static final String BUTTON = "_button";
-//
-// private static final String POPUP = "_popup";
protected Class<UIComboBox> getComponentClass() {
return UIComboBox.class;
}
- /*protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException {
- UIComboBox comboBox = (UIComboBox)component;
- String popupId = comboBox.getClientId(context) + POPUP;
- //writer.startElement(HTML.DIV_ELEM, comboBox);
- //writer.writeAttribute(HTML.id_ATTRIBUTE, popupId, null);
- //writer.writeAttribute(HTML.style_ATTRIBUTE, "display: none", null);
-
- List <String> suggestionValues = comboBox.getSuggestionValues();
- if (suggestionValues != null) {
- for (Iterator <String> iterator = suggestionValues.iterator(); iterator.hasNext();) {
- String suggestion = iterator .next();
- encodeSuggestion(writer, comboBox, suggestion);
- }
- }
-
- //writer.endElement(HTML.DIV_ELEM);
- //writer.startElement(HTML.SCRIPT_ELEM, component);
- //writer.writeText(encodeScript(context, component,popupId), "script");
- //writer.endElement(HTML.SCRIPT_ELEM);
-
- }*/
-
public void encodeItems( FacesContext context, UIComponent component) throws IOException {
UIComboBox comboBox = (UIComboBox)component;
- List <String> suggestionValues = comboBox.getSuggestionValues();
+ Object suggestionValues = comboBox.getSuggestionValues();
ResponseWriter writer = context.getResponseWriter();
- //TODO we do not need to sort that
- //TODO changing initial data source is a bad idea
- //TODO should go after null check probably
- Collections.sort(suggestionValues);
+
if (suggestionValues != null) {
- for (Iterator <String> iterator = suggestionValues.iterator(); iterator.hasNext();) {
- String suggestion = iterator .next();
+ Object [] items = null;
+
+ if (suggestionValues instanceof Collection) {
+ Collection <String> itemsCollection = (Collection<String>)suggestionValues;
+ items = itemsCollection.toArray();
+ } else if (suggestionValues.getClass().isArray()) {
+ items = (Object []) suggestionValues;
+ } else {
+ throw new IllegalArgumentException("suggestionValues should be Collection of objects or array");
+ }
+
+ for (int i = 0; i < items.length; i++) {
+ String suggestion = (String)items[i];
encodeSuggestion(writer, comboBox, suggestion);
}
}
+
}
protected void encodeSuggestion(ResponseWriter writer, UIComboBox comboBox, String value) throws IOException{
@@ -78,27 +59,9 @@
writer.endElement(HTML.DIV_ELEM);
}
- /*private String encodeScript(FacesContext context, UIComponent component, String popupId){
- UIComboBox comboBox = (UIComboBox) component;
-
- JSFunction function = new JSFunction("new Richfaces.ComboBox");
- String clientId = comboBox.getClientId(context);
- function.addParameter(clientId);
-
- Map<String, String> options = new HashMap<String, String>();
- options.put("input", clientId + INPUT);
- options.put("button", clientId + BUTTON);
- options.put("popup", clientId + POPUP);
- function.addParameter(options);
-
- return (function.toString() + ";");
- }*/
-
public String getItemsTextAsJSArray(FacesContext context, UIComponent component) {
UIComboBox comboBox = (UIComboBox)component;
- List <String> suggestionValues = comboBox.getSuggestionValues();
-
- Collections.sort(suggestionValues); //FIXME
+ Object suggestionValues = comboBox.getSuggestionValues();
return ScriptUtils.toScript(suggestionValues);
}
16 years, 3 months
JBoss Rich Faces SVN: r5138 - trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-01-04 09:36:51 -0500 (Fri, 04 Jan 2008)
New Revision: 5138
Modified:
trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxArrowImage.java
trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxButtonGradient.java
trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxInputGradient.java
Log:
add declarations
Modified: trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxArrowImage.java
===================================================================
--- trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxArrowImage.java 2008-01-04 14:20:32 UTC (rev 5137)
+++ trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxArrowImage.java 2008-01-04 14:36:51 UTC (rev 5138)
@@ -19,7 +19,8 @@
/**
* @author Anton Belevich
- *
+ * @since 3.2.0
+ * ComboBox down image renderer
*/
public class ComboBoxArrowImage extends Java2Dresource{
Modified: trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxButtonGradient.java
===================================================================
--- trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxButtonGradient.java 2008-01-04 14:20:32 UTC (rev 5137)
+++ trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxButtonGradient.java 2008-01-04 14:36:51 UTC (rev 5138)
@@ -7,7 +7,8 @@
/**
* @author Anton Belevich
- *
+ * @since 3.2.0
+ * ComboBox Button gradient renderer
*/
public class ComboBoxButtonGradient extends BaseGradient {
public ComboBoxButtonGradient() {
Modified: trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxInputGradient.java
===================================================================
--- trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxInputGradient.java 2008-01-04 14:20:32 UTC (rev 5137)
+++ trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxInputGradient.java 2008-01-04 14:36:51 UTC (rev 5138)
@@ -7,7 +7,8 @@
/**
* @author Anton Belevich
- *
+ * @since 3.2.0
+ * ComboBox input field gradient renderer
*/
public class ComboBoxInputGradient extends BaseGradient {
public ComboBoxInputGradient() {
16 years, 3 months
JBoss Rich Faces SVN: r5137 - management/design/comboBox.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2008-01-04 09:20:32 -0500 (Fri, 04 Jan 2008)
New Revision: 5137
Modified:
management/design/comboBox/comboBox.doc
Log:
Modified: management/design/comboBox/comboBox.doc
===================================================================
(Binary files differ)
16 years, 3 months
JBoss Rich Faces SVN: r5136 - in trunk/ui/scrollableDataTable: src/main/javascript/ClientUI/common/box and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2008-01-04 08:56:28 -0500 (Fri, 04 Jan 2008)
New Revision: 5136
Removed:
trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/common/box/SplashBox.js
Modified:
trunk/ui/scrollableDataTable/generatescript.xml
trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/common/box/Box.js
trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Grid.js
trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js
trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridFooter.js
trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js
trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/ScrollableGrid.js
trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/layouts/VLayoutManager.js
trunk/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss
trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table.jspx
Log:
merged scrollable-data-table with 3/1/x branch
Modified: trunk/ui/scrollableDataTable/generatescript.xml
===================================================================
--- trunk/ui/scrollableDataTable/generatescript.xml 2008-01-04 13:34:10 UTC (rev 5135)
+++ trunk/ui/scrollableDataTable/generatescript.xml 2008-01-04 13:56:28 UTC (rev 5136)
@@ -36,7 +36,6 @@
<file name="${resources-dir}/ClientUI/layouts/VLayoutManager.js"/>
<file name="${resources-dir}/ClientUI/layouts/GridLayoutManager.js"/>
<file name="${resources-dir}/ClientUI/controls/grid/GridHeader.js"/>
- <file name="${resources-dir}/ClientUI/common/box/SplashBox.js"/>
<file name="${resources-dir}/ClientUI/controls/grid/DataCash.js"/>
<file name="${resources-dir}/ClientUI/controls/grid/GridBody.js"/>
<file name="${resources-dir}/ClientUI/controls/grid/GridFooter.js"/>
@@ -69,7 +68,6 @@
<file name="/ClientUI/layouts/VLayoutManager.js"/>
<file name="/ClientUI/layouts/GridLayoutManager.js"/>
<file name="/ClientUI/controls/grid/GridHeader.js"/>
- <file name="/ClientUI/common/box/SplashBox.js"/>
<file name="/ClientUI/controls/grid/DataCash.js"/>
<file name="/ClientUI/controls/grid/GridBody.js"/>
<file name="/ClientUI/controls/grid/GridFooter.js"/>
Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/common/box/Box.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/common/box/Box.js 2008-01-04 13:34:10 UTC (rev 5135)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/common/box/Box.js 2008-01-04 13:56:28 UTC (rev 5136)
@@ -50,12 +50,6 @@
if(!dontUpdateStyles) {
this.element.setStyle({overflow: 'hidden'});
this.element.setStyle({whiteSpace: 'nowrap'});
-
- // if the element isn't positioned, make it relative
- var position = this.element.getStyle('position');
- if(position != 'absolute' && position != 'fixed'){
- this.element.setStyle({position: 'relative'});
- }
}
},
Deleted: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/common/box/SplashBox.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/common/box/SplashBox.js 2008-01-04 13:34:10 UTC (rev 5135)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/common/box/SplashBox.js 2008-01-04 13:56:28 UTC (rev 5136)
@@ -1,95 +0,0 @@
-/**
- * InlineBox.js Date created: 6.04.2007
- * Copyright (c) 2007 Exadel Inc.
- * @author Denis Morozov <dmorozov(a)exadel.com>
- */
-ClientUILib.declarePackage("ClientUI.common.box.SplashBox");
-
-ClientUILib.requireClass("ClientUI.common.box.Box");
-ClientUILib.requireClass("ClientUI.common.box.Substrate");
-
-/**
- * Base class that wrap work with inline blocks like span
- */
-ClientUI.common.box.SplashBox = Class.create(ClientUI.common.box.Box, {
-
- initialize: function($super, text, parentElement, zIndex, supressSplash) {
- $super(null, parentElement);
- this.moveTo(-1000, -1000);
- this.zIndex = zIndex || 500;
- this.supressSplash = supressSplash || false;
- this.createControl(text);
- this.hide();
- },
- createControl: function(text) {
- this.element.setStyle({zIndex: this.zIndex});
- this.makeAbsolute();
-
- this.frame = new ClientUI.common.box.Substrate(null, this.getElement());
- this.frame.getElement().setStyle({zIndex: this.zIndex + 1});
- this.frame.getElement().setStyle({backgroundColor: "#FFFFFF"});
- this.frame.getElement().setStyle({border: "medium none"});
- this.frame.getElement().setStyle({opacity: "0"});
- this.frame.moveTo(0, 0);
- this.frame.setWidth(this.getWidth());
- this.frame.setHeight(this.getHeight());
-
- if(!this.supressSplash) {
- this.div = new ClientUI.common.box.Box(null, this.getElement());
- this.div.getElement().setStyle({zIndex: this.zIndex + 2});
- this.div.getElement().setStyle({backgroundColor: "#000000"});
- this.div.getElement().setStyle({opacity: "0.6"});
- this.div.makeAbsolute();
- this.div.moveTo(0, 0);
- this.div.setWidth(this.getWidth());
- this.div.setHeight(this.getHeight());
- this.div.show();
- }
-
- this.text = new ClientUI.common.box.Box(text, this.getElement());
- this.text.setParent(this.getElement());
- this.text.getElement().setStyle({zIndex: this.zIndex + 100});
- if(!text)
- this.text.getElement().innerHTML = "<font size='4' color='white'>Loading...</font>";
- this.text.makeAbsolute();
- this.text.show();
-
- },
- setSize: function(width, height) {
- this.setWidth(width);
- this.setHeight(height);
- this.containerWidth = width;
- this.containerHeight = height;
- },
- setImage: function(image) {
- if(!this.img) {
- this.img = new ClientUI.common.box.Box($(document.createElement("img")), this.div.getElement());
- this.img.makeAbsolute();
- }
- this.img.getElement().src = image;
- this.text.hide();
- },
- updateLayout: function() {
- var width = this.containerWidth||this.getWidth();
- var height = this.containerHeight||this.getHeight();
-
- this.frame.setWidth(width);
- this.frame.setHeight(height);
-
- if(!this.supressSplash) {
- this.div.setWidth(width);
- this.div.setHeight(height);
- }
-
- if(this.img) {
- var x = width/2 - this.img.getWidth()/2;
- var y = height/2 - this.img.getHeight()/2;
- this.img.moveTo(x, y);
- }
- else {
- var x = width/2 - this.text.getWidth()/2;
- var y = height/2 - this.text.getHeight()/2;
- this.text.moveTo(x, y);
- }
- }
-});
Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Grid.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Grid.js 2008-01-04 13:34:10 UTC (rev 5135)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Grid.js 2008-01-04 13:56:28 UTC (rev 5136)
@@ -68,13 +68,14 @@
this.currentScrollPos = 0;
this.controlCreated = true;
- this.updateLayout();
-
- if (ClientUILib.isIE && !ClientUILib.isIE7) {
- var grid = this;
- setTimeout(function() {grid.updateLayout()}, 50);
- }
+ var grid = this;
+ Utils.execOnLoad(
+ function(){
+ grid.updateLayout();
+ },
+ Utils.Condition.ElementPresent(grid.client_id), 100);
},
+
updateLayout: function($super) {
if(!this.controlCreated || this.getHeight()==0) {
return;
Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js 2008-01-04 13:34:10 UTC (rev 5135)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js 2008-01-04 13:56:28 UTC (rev 5136)
@@ -94,10 +94,8 @@
}
this.contentBox = new ClientUI.common.box.Box(normal);
- this.contentBox.makeAbsolute();
Event.observe(this.contentBox.getElement(), 'keypress', this.synchronizeScroll.bindAsEventListener(this));
this.frozenContentBox = new ClientUI.common.box.Box(frozen);
- this.frozenContentBox.makeAbsolute();
this.helpObject1 = new ClientUI.common.box.Box(this.gridId + ":nho", this.contentBox.getElement());
this.helpObject2 = new ClientUI.common.box.Box(this.gridId + ":fho", this.frozenContentBox.getElement());
@@ -231,7 +229,7 @@
this.container.setHeight(height - fixH);
this.defaultRowHeight = this._calcDefaultRowHeight();
- this.sizeBox.hide();
+ this.scrollBox.hide();
this.sizeBox.setHeight(this.defaultRowHeight * this.grid.dataModel.getCount() + fixH);
this.helpObject1.moveToY(this.sizeBox.getHeight()+ this.defaultRowHeight + 5);
this.helpObject2.moveToY(this.sizeBox.getHeight()+ this.defaultRowHeight + 5);
@@ -241,7 +239,7 @@
if(height > 0) {
this.adjustDataPosition(this.currentPos);
}
- this.sizeBox.show();
+ this.scrollBox.show();
var viewWidth = this.scrollBox.getViewportWidth();
this.container.setWidth(viewWidth);
Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridFooter.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridFooter.js 2008-01-04 13:34:10 UTC (rev 5135)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridFooter.js 2008-01-04 13:56:28 UTC (rev 5136)
@@ -67,10 +67,8 @@
throw(errMsg);
}
this.contentBox = new ClientUI.common.box.Box(normal);
- this.contentBox.makeAbsolute();
this.frozenContentBox = new ClientUI.common.box.Box(frozen);
- this.frozenContentBox.makeAbsolute();
-
+
// create row template
var ch = this.contentBox.getElement().firstChild;
while(ch) {
Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js 2008-01-04 13:34:10 UTC (rev 5135)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js 2008-01-04 13:56:28 UTC (rev 5136)
@@ -83,10 +83,8 @@
throw(errMsg);
}
this.contentBox = new ClientUI.common.box.Box(normal);
- this.contentBox.makeAbsolute();
this.frozenContentBox = new ClientUI.common.box.Box(frozen);
- this.frozenContentBox.makeAbsolute();
-
+
// create row template
var ch = this.contentBox.getElement().firstChild;
while(ch) {
Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/ScrollableGrid.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/ScrollableGrid.js 2008-01-04 13:34:10 UTC (rev 5135)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/ScrollableGrid.js 2008-01-04 13:56:28 UTC (rev 5136)
@@ -16,39 +16,21 @@
{pane: GridLayout_Enum.BODY, ref: this.client_id +"_" + "GridBodyTemplate"},
{pane: GridLayout_Enum.FOOTER, ref: this.client_id +"_" + "GridFooterTemplate"}
];
- var grid = this;
- var s = $super;
- Utils.execOnLoad(
- function(){
- grid.init(s);
- },
- Utils.Condition.ElementPresent(grid.client_id), 100);
+ this.startCreateTime = (new Date()).getTime();
+
+ $super(this.client_id, this.dataModel, this.templates);
+
+ this.endCreateTime = (new Date()).getTime();
+ Event.observe(this.element, "grid:onsort", this.onSorted.bindAsEventListener(this));
+ if (this.options.selectionInput) {
+ this.selectionManager = new ClientUI.controls.grid.SelectionManager(this);
+ }
+ this.getBody().restoreScrollState();
this.endInitTime = (new Date()).getTime();
this.rowCallbacks = [];
},
-
-// initialize parent Grid
- init: function(superCtor){
- // mark that grid control initialized
- if(!this.isInitialized) {
- this.isInitialized = true;
- this.startCreateTime = (new Date()).getTime();
-
- superCtor(this.client_id, this.dataModel, this.templates);
-
- this.endCreateTime = (new Date()).getTime();
-
- Event.observe(this.element, "grid:onsort", this.onSorted.bindAsEventListener(this));
- if (this.options.selectionInput) {
- this.selectionManager = new ClientUI.controls.grid.SelectionManager(this);
- }
- this.element.fire("grid:initialized");
- this.getBody().restoreScrollState();
- }
- },
-
onSortComplete : function(request, event, data){
this.dataModel.count = $(this.client_id + "_rows_input").value;
var options = request.getJSON("options");
Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/layouts/VLayoutManager.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/layouts/VLayoutManager.js 2008-01-04 13:34:10 UTC (rev 5135)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/layouts/VLayoutManager.js 2008-01-04 13:56:28 UTC (rev 5136)
@@ -23,10 +23,6 @@
ClientUI.layouts.VLayoutManager = Class.create(ClientUI.layouts.LayoutManager, {
initialize: function($super, element, parentElement, config) {
$super(element, parentElement);
- if(!element || !element.id) {
- this.element.id = "ClientUI_VLayoutManager" + ClientUI_layouts_VLayoutManager_idGenerator++;
- }
-
this.registerEvents();
},
registerEvents: function($super) {
Modified: trunk/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss
===================================================================
--- trunk/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss 2008-01-04 13:34:10 UTC (rev 5135)
+++ trunk/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss 2008-01-04 13:56:28 UTC (rev 5136)
@@ -229,7 +229,8 @@
.dr-sdt-tmplbox {
display: block;
- float:left;
+ float:left;
+ position: absolute;
}
.dr-sdt-inlinebox {
Modified: trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table.jspx
===================================================================
--- trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table.jspx 2008-01-04 13:34:10 UTC (rev 5135)
+++ trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table.jspx 2008-01-04 13:56:28 UTC (rev 5136)
@@ -85,7 +85,7 @@
</jsp:scriptlet>
<tr>
<td style="height: 100%;">
- <div id="#{clientId}:c" 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="" scrolling="no" frameborder="0" > <br/> </iframe>
16 years, 3 months
JBoss Rich Faces SVN: r5135 - in branches/3.1.x/ui/scrollableDataTable: src/main/javascript/ClientUI/common/box and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2008-01-04 08:34:10 -0500 (Fri, 04 Jan 2008)
New Revision: 5135
Removed:
branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/common/box/SplashBox.js
Modified:
branches/3.1.x/ui/scrollableDataTable/generatescript.xml
branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/common/box/Box.js
branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js
branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridFooter.js
branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js
branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/layouts/VLayoutManager.js
branches/3.1.x/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss
branches/3.1.x/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table.jspx
Log:
PS-137
Modified: branches/3.1.x/ui/scrollableDataTable/generatescript.xml
===================================================================
--- branches/3.1.x/ui/scrollableDataTable/generatescript.xml 2008-01-04 12:40:06 UTC (rev 5134)
+++ branches/3.1.x/ui/scrollableDataTable/generatescript.xml 2008-01-04 13:34:10 UTC (rev 5135)
@@ -36,7 +36,6 @@
<file name="${resources-dir}/ClientUI/layouts/VLayoutManager.js"/>
<file name="${resources-dir}/ClientUI/layouts/GridLayoutManager.js"/>
<file name="${resources-dir}/ClientUI/controls/grid/GridHeader.js"/>
- <file name="${resources-dir}/ClientUI/common/box/SplashBox.js"/>
<file name="${resources-dir}/ClientUI/controls/grid/DataCash.js"/>
<file name="${resources-dir}/ClientUI/controls/grid/GridBody.js"/>
<file name="${resources-dir}/ClientUI/controls/grid/GridFooter.js"/>
@@ -69,7 +68,6 @@
<file name="/ClientUI/layouts/VLayoutManager.js"/>
<file name="/ClientUI/layouts/GridLayoutManager.js"/>
<file name="/ClientUI/controls/grid/GridHeader.js"/>
- <file name="/ClientUI/common/box/SplashBox.js"/>
<file name="/ClientUI/controls/grid/DataCash.js"/>
<file name="/ClientUI/controls/grid/GridBody.js"/>
<file name="/ClientUI/controls/grid/GridFooter.js"/>
Modified: branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/common/box/Box.js
===================================================================
--- branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/common/box/Box.js 2008-01-04 12:40:06 UTC (rev 5134)
+++ branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/common/box/Box.js 2008-01-04 13:34:10 UTC (rev 5135)
@@ -50,12 +50,6 @@
if(!dontUpdateStyles) {
this.element.setStyle({overflow: 'hidden'});
this.element.setStyle({whiteSpace: 'nowrap'});
-
- // if the element isn't positioned, make it relative
- var position = this.element.getStyle('position');
- if(position != 'absolute' && position != 'fixed'){
- this.element.setStyle({position: 'relative'});
- }
}
},
Deleted: branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/common/box/SplashBox.js
===================================================================
--- branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/common/box/SplashBox.js 2008-01-04 12:40:06 UTC (rev 5134)
+++ branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/common/box/SplashBox.js 2008-01-04 13:34:10 UTC (rev 5135)
@@ -1,95 +0,0 @@
-/**
- * InlineBox.js Date created: 6.04.2007
- * Copyright (c) 2007 Exadel Inc.
- * @author Denis Morozov <dmorozov(a)exadel.com>
- */
-ClientUILib.declarePackage("ClientUI.common.box.SplashBox");
-
-ClientUILib.requireClass("ClientUI.common.box.Box");
-ClientUILib.requireClass("ClientUI.common.box.Substrate");
-
-/**
- * Base class that wrap work with inline blocks like span
- */
-ClientUI.common.box.SplashBox = Class.create(ClientUI.common.box.Box, {
-
- initialize: function($super, text, parentElement, zIndex, supressSplash) {
- $super(null, parentElement);
- this.moveTo(-1000, -1000);
- this.zIndex = zIndex || 500;
- this.supressSplash = supressSplash || false;
- this.createControl(text);
- this.hide();
- },
- createControl: function(text) {
- this.element.setStyle({zIndex: this.zIndex});
- this.makeAbsolute();
-
- this.frame = new ClientUI.common.box.Substrate(null, this.getElement());
- this.frame.getElement().setStyle({zIndex: this.zIndex + 1});
- this.frame.getElement().setStyle({backgroundColor: "#FFFFFF"});
- this.frame.getElement().setStyle({border: "medium none"});
- this.frame.getElement().setStyle({opacity: "0"});
- this.frame.moveTo(0, 0);
- this.frame.setWidth(this.getWidth());
- this.frame.setHeight(this.getHeight());
-
- if(!this.supressSplash) {
- this.div = new ClientUI.common.box.Box(null, this.getElement());
- this.div.getElement().setStyle({zIndex: this.zIndex + 2});
- this.div.getElement().setStyle({backgroundColor: "#000000"});
- this.div.getElement().setStyle({opacity: "0.6"});
- this.div.makeAbsolute();
- this.div.moveTo(0, 0);
- this.div.setWidth(this.getWidth());
- this.div.setHeight(this.getHeight());
- this.div.show();
- }
-
- this.text = new ClientUI.common.box.Box(text, this.getElement());
- this.text.setParent(this.getElement());
- this.text.getElement().setStyle({zIndex: this.zIndex + 100});
- if(!text)
- this.text.getElement().innerHTML = "<font size='4' color='white'>Loading...</font>";
- this.text.makeAbsolute();
- this.text.show();
-
- },
- setSize: function(width, height) {
- this.setWidth(width);
- this.setHeight(height);
- this.containerWidth = width;
- this.containerHeight = height;
- },
- setImage: function(image) {
- if(!this.img) {
- this.img = new ClientUI.common.box.Box($(document.createElement("img")), this.div.getElement());
- this.img.makeAbsolute();
- }
- this.img.getElement().src = image;
- this.text.hide();
- },
- updateLayout: function() {
- var width = this.containerWidth||this.getWidth();
- var height = this.containerHeight||this.getHeight();
-
- this.frame.setWidth(width);
- this.frame.setHeight(height);
-
- if(!this.supressSplash) {
- this.div.setWidth(width);
- this.div.setHeight(height);
- }
-
- if(this.img) {
- var x = width/2 - this.img.getWidth()/2;
- var y = height/2 - this.img.getHeight()/2;
- this.img.moveTo(x, y);
- }
- else {
- var x = width/2 - this.text.getWidth()/2;
- var y = height/2 - this.text.getHeight()/2;
- this.text.moveTo(x, y);
- }
- }
-});
Modified: branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js
===================================================================
--- branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js 2008-01-04 12:40:06 UTC (rev 5134)
+++ branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js 2008-01-04 13:34:10 UTC (rev 5135)
@@ -94,10 +94,8 @@
}
this.contentBox = new ClientUI.common.box.Box(normal);
- this.contentBox.makeAbsolute();
Event.observe(this.contentBox.getElement(), 'keypress', this.synchronizeScroll.bindAsEventListener(this));
this.frozenContentBox = new ClientUI.common.box.Box(frozen);
- this.frozenContentBox.makeAbsolute();
this.helpObject1 = new ClientUI.common.box.Box(this.gridId + ":nho", this.contentBox.getElement());
this.helpObject2 = new ClientUI.common.box.Box(this.gridId + ":fho", this.frozenContentBox.getElement());
@@ -231,7 +229,7 @@
this.container.setHeight(height - fixH);
this.defaultRowHeight = this._calcDefaultRowHeight();
- this.sizeBox.hide();
+ this.scrollBox.hide();
this.sizeBox.setHeight(this.defaultRowHeight * this.grid.dataModel.getCount() + fixH);
this.helpObject1.moveToY(this.sizeBox.getHeight()+ this.defaultRowHeight + 5);
this.helpObject2.moveToY(this.sizeBox.getHeight()+ this.defaultRowHeight + 5);
@@ -241,7 +239,7 @@
if(height > 0) {
this.adjustDataPosition(this.currentPos);
}
- this.sizeBox.show();
+ this.scrollBox.show();
var viewWidth = this.scrollBox.getViewportWidth();
this.container.setWidth(viewWidth);
Modified: branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridFooter.js
===================================================================
--- branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridFooter.js 2008-01-04 12:40:06 UTC (rev 5134)
+++ branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridFooter.js 2008-01-04 13:34:10 UTC (rev 5135)
@@ -67,10 +67,8 @@
throw(errMsg);
}
this.contentBox = new ClientUI.common.box.Box(normal);
- this.contentBox.makeAbsolute();
this.frozenContentBox = new ClientUI.common.box.Box(frozen);
- this.frozenContentBox.makeAbsolute();
-
+
// create row template
var ch = this.contentBox.getElement().firstChild;
while(ch) {
Modified: branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js
===================================================================
--- branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js 2008-01-04 12:40:06 UTC (rev 5134)
+++ branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js 2008-01-04 13:34:10 UTC (rev 5135)
@@ -83,10 +83,8 @@
throw(errMsg);
}
this.contentBox = new ClientUI.common.box.Box(normal);
- this.contentBox.makeAbsolute();
this.frozenContentBox = new ClientUI.common.box.Box(frozen);
- this.frozenContentBox.makeAbsolute();
-
+
// create row template
var ch = this.contentBox.getElement().firstChild;
while(ch) {
Modified: branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/layouts/VLayoutManager.js
===================================================================
--- branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/layouts/VLayoutManager.js 2008-01-04 12:40:06 UTC (rev 5134)
+++ branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/layouts/VLayoutManager.js 2008-01-04 13:34:10 UTC (rev 5135)
@@ -23,10 +23,6 @@
ClientUI.layouts.VLayoutManager = Class.create(ClientUI.layouts.LayoutManager, {
initialize: function($super, element, parentElement, config) {
$super(element, parentElement);
- if(!element || !element.id) {
- this.element.id = "ClientUI_VLayoutManager" + ClientUI_layouts_VLayoutManager_idGenerator++;
- }
-
this.registerEvents();
},
registerEvents: function($super) {
Modified: branches/3.1.x/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss
===================================================================
--- branches/3.1.x/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss 2008-01-04 12:40:06 UTC (rev 5134)
+++ branches/3.1.x/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss 2008-01-04 13:34:10 UTC (rev 5135)
@@ -229,7 +229,8 @@
.dr-sdt-tmplbox {
display: block;
- float:left;
+ float:left;
+ position: absolute;
}
.dr-sdt-inlinebox {
Modified: branches/3.1.x/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table.jspx
===================================================================
--- branches/3.1.x/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table.jspx 2008-01-04 12:40:06 UTC (rev 5134)
+++ branches/3.1.x/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table.jspx 2008-01-04 13:34:10 UTC (rev 5135)
@@ -85,7 +85,7 @@
</jsp:scriptlet>
<tr>
<td style="height: 100%;">
- <div id="#{clientId}:c" 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="" scrolling="no" frameborder="0" > <br/> </iframe>
16 years, 3 months