JBoss Rich Faces SVN: r3108 - in branches/3.1.x/ui/tree/src/main: templates and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-09-25 10:59:18 -0400 (Tue, 25 Sep 2007)
New Revision: 3108
Modified:
branches/3.1.x/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item.js
branches/3.1.x/ui/tree/src/main/templates/htmlTree.jspx
Log:
RF-993
Modified: branches/3.1.x/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item.js
===================================================================
--- branches/3.1.x/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item.js 2007-09-25 14:44:12 UTC (rev 3107)
+++ branches/3.1.x/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item.js 2007-09-25 14:59:18 UTC (rev 3108)
@@ -52,10 +52,17 @@
},
observeEvents: function(element) {
- var cells = element.rows[0].cells;
- //seeking by id seems to be miserably slow in IE than by index
- var eIcon = cells[this.elementID.icon];
- var eText = cells[this.elementID.text];
+ var eIcon = null;
+ var eText = null;
+ if ("NETSCAPE" == RichFaces.navigatorType()) {
+ eIcon = $(this.elementID.icon);
+ eText = $(this.elementID.text);
+ } else {
+ var cells = element.rows[0].cells;
+ //seeking by id seems to be miserably slow in IE than by index
+ eIcon = cells[this.elementID.icon];
+ eText = cells[this.elementID.text];
+ }
if (eIcon) {
Event.observe(eIcon, "mousedown", this.eventSelectionClick);
Event.observe(eIcon, "mouseout", this.eventMouseOut);
Modified: branches/3.1.x/ui/tree/src/main/templates/htmlTree.jspx
===================================================================
--- branches/3.1.x/ui/tree/src/main/templates/htmlTree.jspx 2007-09-25 14:44:12 UTC (rev 3107)
+++ branches/3.1.x/ui/tree/src/main/templates/htmlTree.jspx 2007-09-25 14:59:18 UTC (rev 3108)
@@ -24,7 +24,8 @@
/org/richfaces/renderkit/html/scripts/tree-selection.js,
/org/richfaces/renderkit/html/scripts/tree-item.js,
/org/richfaces/renderkit/html/scripts/tree-item-dnd.js,
- /org/richfaces/renderkit/html/scripts/drag-indicator.js
+ /org/richfaces/renderkit/html/scripts/drag-indicator.js,
+ /org/richfaces/renderkit/html/scripts/browser_info.js
</h:scripts>
<f:clientId var="clientId" />
16 years, 7 months
JBoss Rich Faces SVN: r3107 - in branches/3.1.x/framework: impl/src/main/java/org/richfaces/model and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2007-09-25 10:44:12 -0400 (Tue, 25 Sep 2007)
New Revision: 3107
Removed:
branches/3.1.x/framework/api/src/main/java/org/richfaces/model/selection/ClientSelection.java
branches/3.1.x/framework/api/src/main/java/org/richfaces/model/selection/SelectionRange.java
branches/3.1.x/framework/impl/src/main/java/org/richfaces/model/selection/
branches/3.1.x/framework/impl/src/test/java/org/richfaces/model/selection/
Log:
fixed unit tests
Deleted: branches/3.1.x/framework/api/src/main/java/org/richfaces/model/selection/ClientSelection.java
===================================================================
--- branches/3.1.x/framework/api/src/main/java/org/richfaces/model/selection/ClientSelection.java 2007-09-25 14:30:44 UTC (rev 3106)
+++ branches/3.1.x/framework/api/src/main/java/org/richfaces/model/selection/ClientSelection.java 2007-09-25 14:44:12 UTC (rev 3107)
@@ -1,129 +0,0 @@
-/**
- *
- */
-package org.richfaces.model.selection;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * @author Maksim Kaszynski
- *
- */
-public class ClientSelection implements Serializable{
-
- private static final long serialVersionUID = 5855157282287053681L;
-
- public static final String FLAG_RESET = "x";
-
- public static final String FLAG_ALL = "a";
-
- private String selectionFlag;
-
- private List ranges = new ArrayList();
-
- public ClientSelection() {
- }
-
-
- public void addRange(SelectionRange range) {
- ranges.add(range);
- }
-
- public boolean isSelected(int i) {
- boolean result = false;
- Iterator iterator = ranges.iterator();
- while (iterator.hasNext() && !result) {
- result |= ((SelectionRange) iterator.next()).within(i);
- }
- return result;
- }
-
- public List getRanges() {
- return ranges;
- }
-
- public void addIndex(int j) {
- if(this.isSelected(j)) return;
-
-
-
- SelectionRange firstRange = null;
-
- int s = ranges.size();
-
- int insertPosition = 0;
-
- for(int i = 0; i < s && insertPosition >= 0 ; i++) {
-
- firstRange = (SelectionRange) ranges.get(i);
-
- if (firstRange.getStartIndex() == j + 1) {
-
- firstRange.setStartIndex(j);
- insertPosition = -1;
-
- } else if (firstRange.getEndIndex() == j - 1) {
-
- firstRange.setEndIndex(j);
-
- if (i + 1 < s) {
- SelectionRange range2 = (SelectionRange) ranges.get(i + 1);
-
- if (range2.getStartIndex() == j || range2.getStartIndex() == j + 1) {
-
- ranges.remove(i + 1);
-
- firstRange.setEndIndex(range2.getEndIndex());
- }
- }
-
- insertPosition = -1;
-
- } else if (firstRange.getStartIndex() > j) {
- insertPosition = i;
- }
-
- }
-
- if (insertPosition >= 0) {
- firstRange = new SelectionRange(j,j);
- ranges.add(insertPosition, firstRange);
-
- return;
- }
-
-
- }
-
- private boolean reset = false;
- public boolean isReset() {
- return reset;
- }
-
- private boolean selectAll = false;
- public boolean isSelectAll() {
- return selectAll;
- }
-
-
- public String getSelectionFlag() {
- return selectionFlag;
- }
-
-
- public void setSelectionFlag(String selectionFlag) {
- this.selectionFlag = selectionFlag;
-
- reset = false;
- selectAll = false;
-
- if (FLAG_ALL.equals(selectionFlag)) {
- selectAll = true;
- } else if (FLAG_RESET.equals(selectionFlag)) {
- reset = true;
- }
- }
-}
Deleted: branches/3.1.x/framework/api/src/main/java/org/richfaces/model/selection/SelectionRange.java
===================================================================
--- branches/3.1.x/framework/api/src/main/java/org/richfaces/model/selection/SelectionRange.java 2007-09-25 14:30:44 UTC (rev 3106)
+++ branches/3.1.x/framework/api/src/main/java/org/richfaces/model/selection/SelectionRange.java 2007-09-25 14:44:12 UTC (rev 3107)
@@ -1,64 +0,0 @@
-/**
- *
- */
-package org.richfaces.model.selection;
-
-/**
- * @author Maksim Kaszynski
- *
- */
-public class SelectionRange {
- private int startIndex = -1;;
- private int endIndex = -1;
-
- public SelectionRange(int startIndex, int endIndex) {
- super();
- this.startIndex = startIndex;
- this.endIndex = endIndex;
- }
-
- public int getStartIndex() {
- return startIndex;
- }
-
- public void setStartIndex(int startIndex) {
- this.startIndex = startIndex;
- }
-
- public int getEndIndex() {
- return endIndex;
- }
-
- public void setEndIndex(int endIndex) {
- this.endIndex = endIndex;
- }
-
- public boolean within(int index) {
- return startIndex <= index && endIndex >= index;
- }
-
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + endIndex;
- result = prime * result + startIndex;
- return result;
- }
-
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- final SelectionRange other = (SelectionRange) obj;
- if (endIndex != other.endIndex)
- return false;
- if (startIndex != other.startIndex)
- return false;
- return true;
- }
-
-
-}
16 years, 7 months
JBoss Rich Faces SVN: r3106 - in trunk/test-applications/jsp/src/main/webapp: pages/RichMenu and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-09-25 10:30:44 -0400 (Tue, 25 Sep 2007)
New Revision: 3106
Modified:
trunk/test-applications/jsp/src/main/webapp/Panel/Panel2.jsp
trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp
Log:
http://jira.jboss.com/jira/browse/RF-985
Modified: trunk/test-applications/jsp/src/main/webapp/Panel/Panel2.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Panel/Panel2.jsp 2007-09-25 14:05:02 UTC (rev 3105)
+++ trunk/test-applications/jsp/src/main/webapp/Panel/Panel2.jsp 2007-09-25 14:30:44 UTC (rev 3106)
@@ -120,15 +120,15 @@
</rich:panel>
</h:panelGrid>
+
<rich:panel style="position: absolute; top: 116px; right: 100px; " styleClass="top">
<f:facet name="header">
<h:outputText value="Header of the Panel" />
</f:facet>
<h:outputText escape="false" value=" This is a panel with absolute position on the screen.<br />
Resize the browser's window for fun." />
+ </rich:panel>
- </rich:panel>
- </rich:panel>
<rich:panel style="width:#{panel.width};height:#{panel.height}">
<f:facet name="header">
<f:verbatim>
Modified: trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp 2007-09-25 14:05:02 UTC (rev 3105)
+++ trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp 2007-09-25 14:30:44 UTC (rev 3106)
@@ -27,7 +27,7 @@
<f:selectItem itemValue="/ModalPanel/ModalPanel.jsp" itemLabel="Modal Panel" />
<f:selectItem itemValue="/Paint2D/Paint2D.jsp" itemLabel="Paint2D" />
<f:selectItem itemValue="/Panel/Panel.jsp" itemLabel="Panel" />
- <f:selectItem itemValue="/Panel/panel2.jsp" itemLabel="Panel2" />
+ <f:selectItem itemValue="/Panel/Panel2.jsp" itemLabel="Panel2" />
<f:selectItem itemValue="/PanelBar/PanelBar.jsp" itemLabel="Panel Bar" />
<f:selectItem itemValue="/PanelMenu/PanelMenu.jsp" itemLabel="Panel Menu" />
<f:selectItem itemValue="/Separator/Separator.jsp" itemLabel="Separator" />
16 years, 7 months
JBoss Rich Faces SVN: r3105 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: vkorluzhenko
Date: 2007-09-25 10:05:02 -0400 (Tue, 25 Sep 2007)
New Revision: 3105
Modified:
trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml
Log:
http://jira.jboss.com/jira/browse/RF-920 - added skins.
Modified: trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml 2007-09-25 14:04:30 UTC (rev 3104)
+++ trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml 2007-09-25 14:05:02 UTC (rev 3105)
@@ -125,6 +125,127 @@
</itemizedlist>
</section>
+ <section>
+ <title>Skin parameters redefinition</title>
+
+ <table>
+ <title>Skin parameters redefinition for a table</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Skin parameters</entry>
+ <entry>CSS properties</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>tableBackgroundColor</entry>
+ <entry>background-color</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <table>
+ <title>Skin parameters redefinition for a header</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Skin parameters</entry>
+ <entry>CSS properties</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>headerBackgroundColor</entry>
+ <entry>background-color</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <table>
+ <title>Skin parameters redefinition for a footer</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Skin parameters</entry>
+ <entry>CSS properties</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>tableFooterBackgroundColor</entry>
+ <entry>background-color</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <table>
+ <title>Skin parameters redefinition for a column header</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Skin parameters</entry>
+ <entry>CSS properties</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>additionalBackgroundColor</entry>
+ <entry>background-color</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <table>
+ <title>Skin parameters redefinition for a column footer</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Skin parameters</entry>
+ <entry>CSS properties</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>tableSubfooterBackgroundColor</entry>
+ <entry>background-color</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <table>
+ <title>Skin parameters redefinition for cells</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Skin parameters</entry>
+ <entry>CSS properties</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>generalSizeFont</entry>
+ <entry>font-size</entry>
+ </row>
+ <row>
+ <entry>generalTextColor</entry>
+ <entry>color</entry>
+ </row>
+ <row>
+ <entry>generalFamilyFont</entry>
+ <entry>font-family</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ </section>
+
<section>
<title>Definition of Custom Style Classes</title>
16 years, 7 months
JBoss Rich Faces SVN: r3104 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: vkorluzhenko
Date: 2007-09-25 10:04:30 -0400 (Tue, 25 Sep 2007)
New Revision: 3104
Modified:
trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml
trunk/docs/userguide/en/src/main/docbook/included/menuGroup.xml
trunk/docs/userguide/en/src/main/docbook/included/menuItem.xml
Log:
http://jira.jboss.com/jira/browse/RF-920 - fixed some errors in descriptions of classes
Modified: trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml 2007-09-25 14:00:12 UTC (rev 3103)
+++ trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml 2007-09-25 14:04:30 UTC (rev 3104)
@@ -493,7 +493,7 @@
<row>
<entry>rich-ddmenu-label-unselect</entry>
- <entry>Defines styles for a wrapper <div> element of a unselected representation
+ <entry>Defines styles for a wrapper <div> element of an unselected representation
element </entry>
</row>
</tbody>
Modified: trunk/docs/userguide/en/src/main/docbook/included/menuGroup.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/menuGroup.xml 2007-09-25 14:00:12 UTC (rev 3103)
+++ trunk/docs/userguide/en/src/main/docbook/included/menuGroup.xml 2007-09-25 14:04:30 UTC (rev 3104)
@@ -263,11 +263,11 @@
</row>
<row>
<entry>rich-menu-item-icon</entry>
- <entry>Defines styles for a left icon of an item</entry>
+ <entry>Defines styles for the left icon of an item</entry>
</row>
<row>
<entry>rich-menu-item-folder</entry>
- <entry>Defines styles for a right icon of an item</entry>
+ <entry>Defines styles for the right icon of an item</entry>
</row>
</tbody>
</tgroup>
@@ -289,11 +289,11 @@
</row>
<row>
<entry>rich-menu-item-icon-disabled</entry>
- <entry>Defines styles for a left icon of a disabled item</entry>
+ <entry>Defines styles for the left icon of a disabled item</entry>
</row>
<row>
<entry>rich-menu-item-folder-disabled</entry>
- <entry>Defines styles for a right icon of a disabled item</entry>
+ <entry>Defines styles for the right icon of a disabled item</entry>
</row>
<row>
<entry>rich-menu-group-hover</entry>
@@ -301,11 +301,11 @@
</row>
<row>
<entry>rich-menu-item-icon-enabled</entry>
- <entry>Defines styles for a left icon of an enabled item</entry>
+ <entry>Defines styles for the left icon of an enabled item</entry>
</row>
<row>
<entry>rich-menu-item-icon-selected</entry>
- <entry>Defines styles for a left icon of a selected item</entry>
+ <entry>Defines styles for the left icon of a selected item</entry>
</row>
</tbody>
</tgroup>
Modified: trunk/docs/userguide/en/src/main/docbook/included/menuItem.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/menuItem.xml 2007-09-25 14:00:12 UTC (rev 3103)
+++ trunk/docs/userguide/en/src/main/docbook/included/menuItem.xml 2007-09-25 14:04:30 UTC (rev 3104)
@@ -291,7 +291,7 @@
</row>
<row>
<entry>rich-menu-item-icon</entry>
- <entry>Defines styles for a left icon of an item</entry>
+ <entry>Defines styles for the left icon of an item</entry>
</row>
</tbody>
</tgroup>
@@ -325,7 +325,7 @@
</row>
<row>
<entry>rich-menu-item-icon-disabled</entry>
- <entry>Defines styles for a left icon of a disabled item</entry>
+ <entry>Defines styles for the left icon of a disabled item</entry>
</row>
<row>
<entry>rich-menu-item-label-enabled</entry>
@@ -333,7 +333,7 @@
</row>
<row>
<entry>rich-menu-item-icon-enabled</entry>
- <entry>Defines styles for a left icon of an enabled item</entry>
+ <entry>Defines styles for the left icon of an enabled item</entry>
</row>
<row>
<entry>rich-menu-item-label-selected</entry>
@@ -341,7 +341,7 @@
</row>
<row>
<entry>rich-menu-item-icon-selected</entry>
- <entry>Defines styles for a left icon of a selected item</entry>
+ <entry>Defines styles for the left icon of a selected item</entry>
</row>
</tbody>
</tgroup>
16 years, 7 months
JBoss Rich Faces SVN: r3103 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: vkorluzhenko
Date: 2007-09-25 10:00:12 -0400 (Tue, 25 Sep 2007)
New Revision: 3103
Modified:
trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml
Log:
http://jira.jboss.com/jira/browse/RF-920 - added new classes, descriptions and skins.
Modified: trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml 2007-09-25 13:58:44 UTC (rev 3102)
+++ trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml 2007-09-25 14:00:12 UTC (rev 3103)
@@ -155,8 +155,9 @@
<section>
<title>Skin parameters redefinition</title>
+
<table>
- <title>Skin parameters redefinition for a hint</title>
+ <title>Skin parameters redefinition for a bar</title>
<tgroup cols="2">
<thead>
<row>
@@ -166,18 +167,91 @@
</thead>
<tbody>
<row>
+ <entry>controlBackgroundColor</entry>
+ <entry>background-color</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <table>
+ <title>Skin parameters redefinition for numbers</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Skin parameters</entry>
+ <entry>CSS properties</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>generalFamilyFont</entry>
+ <entry>font-family</entry>
+ </row>
+ <row>
+ <entry>generalSizeFont</entry>
+ <entry>font-size</entry>
+ </row>
+ <row>
<entry>generalTextColor</entry>
<entry>color</entry>
</row>
<row>
- <entry>buttonSizeFont</entry>
+ <entry>panelBorderColor</entry>
+ <entry>border-color</entry>
+ </row>
+ <row>
+ <entry>generalSizeFont</entry>
+ <entry>line-height</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <table>
+ <title>Skin parameters redefinition for a text field</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Skin parameters</entry>
+ <entry>CSS properties</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>controlBackgroundColor</entry>
+ <entry>background-color</entry>
+ </row>
+ <row>
+ <entry>generalFamilyFont</entry>
+ <entry>font-family</entry>
+ </row>
+ <row>
+ <entry>generalSizeFont</entry>
<entry>font-size</entry>
</row>
+ <row>
+ <entry>controlTextColor</entry>
+ <entry>color</entry>
+ </row>
+ <row>
+ <entry>panelBorderColor</entry>
+ <entry>border-color</entry>
+ </row>
+ <row>
+ <entry>subBorderColor</entry>
+ <entry>border-bottom-color</entry>
+ </row>
+ <row>
+ <entry>subBorderColor</entry>
+ <entry>border-right-color</entry>
+ </row>
</tbody>
</tgroup>
</table>
+
<table>
- <title>Skin parameters redefinition for a header</title>
+ <title>Skin parameters redefinition for a hint</title>
<tgroup cols="2">
<thead>
<row>
@@ -187,13 +261,27 @@
</thead>
<tbody>
<row>
- <entry>headerBackgroundColor</entry>
+ <entry>tipBackgroundColor</entry>
<entry>background-color</entry>
</row>
+ <row>
+ <entry>tipBorderColor</entry>
+ <entry>border-color</entry>
+ </row>
+ <row>
+ <entry>generalFamilyFont</entry>
+ <entry>font-family</entry>
+ </row>
+ <row>
+ <entry>generalSizeFont</entry>
+ <entry>font-size</entry>
+ </row>
</tbody>
</tgroup>
</table>
+
</section>
+
<section>
<title>Definition of Custom Style Classes</title>
@@ -227,12 +315,12 @@
<entry>Defines styles for a bar</entry>
</row>
<row>
- <entry>rich-inslider-handle</entry>
- <entry>Defines styles for a slider handle</entry>
+ <entry>rich-inslider-handler</entry>
+ <entry>Defines styles for a slider handler</entry>
</row>
<row>
- <entry>rich-inslider-handle-selected</entry>
- <entry>Defines styles for a selected handle</entry>
+ <entry>rich-inslider-handler-selected</entry>
+ <entry>Defines styles for a selected handler</entry>
</row>
<row>
<entry>rich-inslider-field</entry>
@@ -240,15 +328,15 @@
</row>
<row>
<entry>rich-inslider-right-num</entry>
- <entry>Defines styles for right number</entry>
+ <entry>Defines styles for the right number</entry>
</row>
<row>
<entry>rich-inslider-left-num</entry>
- <entry>Defines styles for left number</entry>
+ <entry>Defines styles for the left number</entry>
</row>
<row>
<entry>rich-inslider-tip</entry>
- <entry>Defines styles for a tooltip</entry>
+ <entry>Defines styles for a hint</entry>
</row>
</tbody>
</tgroup>
16 years, 7 months
JBoss Rich Faces SVN: r3102 - in trunk/test-applications/jsp/src/main: webapp/DataFilterSlider and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-09-25 09:58:44 -0400 (Tue, 25 Sep 2007)
New Revision: 3102
Modified:
trunk/test-applications/jsp/src/main/java/dfs/DemoSliderBean.java
trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp
trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-DataFilterSlider.xml
Log:
http://jira.jboss.com/jira/browse/RF-985
Modified: trunk/test-applications/jsp/src/main/java/dfs/DemoSliderBean.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/dfs/DemoSliderBean.java 2007-09-25 13:58:37 UTC (rev 3101)
+++ trunk/test-applications/jsp/src/main/java/dfs/DemoSliderBean.java 2007-09-25 13:58:44 UTC (rev 3102)
@@ -36,6 +36,7 @@
private boolean onSlide;
private boolean storeResults;
private boolean trailer;
+ private boolean rendered;
private String width;
private int increment;
private int handleValue;
@@ -45,6 +46,7 @@
DemoInventoryList demoInventoryList;
public DemoSliderBean() {
+ rendered = true;
manualInput = true;
onSlide = true;
storeResults = true;
@@ -69,4 +71,12 @@
}
+ public boolean isRendered() {
+ return rendered;
+ }
+
+ public void setRendered(boolean rendered) {
+ this.rendered = rendered;
+ }
+
}
\ No newline at end of file
Modified: trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp 2007-09-25 13:58:37 UTC (rev 3101)
+++ trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp 2007-09-25 13:58:44 UTC (rev 3102)
@@ -3,69 +3,63 @@
<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<style type="text/css">
+body {
+ font: normal 11px tahoma, sans-serif;
+}
- body{
- font: normal 11px tahoma, sans-serif;
- }
+.column {
+ width: 75px;
+ font: normal 11px tahoma, sans-serif;
+ text-align: center;
+}
- .column{
- width:75px;
- font: normal 11px tahoma, sans-serif;
- text-align:center;
- }
+.column-index {
+ width: 75px;
+ font: normal 11px tahoma, sans-serif;
+ text-align: left;
+}
- .column-index{
- width:75px;
- font: normal 11px tahoma, sans-serif;
- text-align:left;
- }
+.list-row3 {
+ background-color: #ececec;
+}
- .list-row3{
- background-color:#ececec;
- }
+.list-row1 {
+ background-color: #f1f6fd;
+}
- .list-row1{
- background-color:#f1f6fd;
- }
+.list-row2 {
+ background-color: #fff;
+}
- .list-row2{
- background-color:#fff;
- }
+.list-header {
+ font: bold 11px tahoma, sans-serif;
+ text-align: center;
+}
- .list-header{
- font: bold 11px tahoma, sans-serif;
- text-align:center;
- }
+.list-table1 {
+ border: 1px solid #bed6f8;
+}
- .list-table1{
- border:1px solid #bed6f8;
- }
+.list-table2 {
+ border: 1px solid #bed6f8;
+}
+</style>
- .list-table2{
- border:1px solid #bed6f8;
- }
-
-
-
- </style>
-
<f:subview id="dfsID">
- <a4j:form id="form1" reRender="list-body" ajaxSubmit="true"
- ignoreDupResponses="true" requestDelay="100">
-
+ <h:form>
<a4j:region id="stat1">
<a4j:outputPanel id="slider-body">
- <rich:dataFilterSlider sliderListener="#{mybean.doSlide}"
+ <rich:dataFilterSlider sliderListener="#{dfs.doSlide}"
+ rendered="#{dfs.rendered}"
binding="#{inventoryList.dataFilterSlider}" for="carList"
forValRef="inventoryList.carInventory" filterBy="getMileage"
- manualInput="true" onSlide="true"
- storeResults="true" trackStyleClass="track" width="400px"
- styleClass="slider-container" startRange="10000" endRange="60000"
- increment="10000" rangeStyleClass="range" trailer="true"
- trailerStyleClass="trailer" handleStyleClass="handle"
- handleValue="10000" id="slider_1">
+ manualInput="true" onSlide="true" storeResults="true"
+ trackStyleClass="track" width="400px" styleClass="slider-container"
+ startRange="10000" endRange="60000" increment="10000"
+ rangeStyleClass="range" trailer="true" trailerStyleClass="trailer"
+ handleStyleClass="handle" handleValue="10000" id="slider_1">
</rich:dataFilterSlider>
</a4j:outputPanel>
@@ -126,8 +120,14 @@
</h:dataTable>
</a4j:outputPanel>
</a4j:region>
+
+ <h:panelGrid columns="2">
+ <h:outputText value="Rendered" />
+ <h:selectBooleanCheckbox value="#{dfs.rendered}" onclick="submit();" />
+ </h:panelGrid>
+
<h:commandLink value="Back" action="main"></h:commandLink>
- </a4j:form>
+ </h:form>
</f:subview>
Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-DataFilterSlider.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-DataFilterSlider.xml 2007-09-25 13:58:37 UTC (rev 3101)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-DataFilterSlider.xml 2007-09-25 13:58:44 UTC (rev 3102)
@@ -3,7 +3,7 @@
"http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
<faces-config>
<managed-bean>
- <managed-bean-name>mybean</managed-bean-name>
+ <managed-bean-name>dfs</managed-bean-name>
<managed-bean-class>dfs.DemoSliderBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
<managed-property>
16 years, 7 months
JBoss Rich Faces SVN: r3101 - in trunk/test-applications/facelets/src/main: webapp/DataFilterSlider and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-09-25 09:58:37 -0400 (Tue, 25 Sep 2007)
New Revision: 3101
Modified:
trunk/test-applications/facelets/src/main/java/dfs/DemoSliderBean.java
trunk/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml
trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DataFilterSlider.xml
Log:
http://jira.jboss.com/jira/browse/RF-985
Modified: trunk/test-applications/facelets/src/main/java/dfs/DemoSliderBean.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/dfs/DemoSliderBean.java 2007-09-25 13:58:18 UTC (rev 3100)
+++ trunk/test-applications/facelets/src/main/java/dfs/DemoSliderBean.java 2007-09-25 13:58:37 UTC (rev 3101)
@@ -29,10 +29,13 @@
*
*/
public class DemoSliderBean {
-
+ private boolean rendered;
DemoInventoryList demoInventoryList;
-
+ public DemoSliderBean() {
+ rendered = true;
+ }
+
public void setDemoInventoryList(DemoInventoryList demoInventoryList) {
this.demoInventoryList = demoInventoryList;
}
@@ -46,4 +49,12 @@
}
+ public boolean isRendered() {
+ return rendered;
+ }
+
+ public void setRendered(boolean rendered) {
+ this.rendered = rendered;
+ }
+
}
\ No newline at end of file
Modified: trunk/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml 2007-09-25 13:58:18 UTC (rev 3100)
+++ trunk/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml 2007-09-25 13:58:37 UTC (rev 3101)
@@ -1,11 +1,11 @@
- <a4j:form id="form1" reRender="list-body" ajaxSubmit="true"
- ignoreDupResponses="true" requestDelay="100"
- xmlns:f="http://java.sun.com/jsf/core"
+ <h:form
+ xmlns:f="http://java.sun.com/jsf/core"
xmlns:a4j="http://richfaces.org/a4j"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich"
xmlns:ui="http://java.sun.com/jsf/facelets">
- <style type="text/css">
+
+ <style type= "text/css">
body{
font: normal 11px tahoma, sans-serif;
@@ -52,7 +52,7 @@
<a4j:region id="stat1">
<a4j:outputPanel id="slider-body">
- <rich:dataFilterSlider sliderListener="#{mybean.doSlide}"
+ <rich:dataFilterSlider sliderListener="#{dfs.doSlide}" rendered="#{dfs.rendered}"
binding="#{inventoryList.dataFilterSlider}" for="carList"
forValRef="inventoryList.carInventory" filterBy="getMileage"
manualInput="true" onSlide="true" onChange="true"
@@ -67,9 +67,6 @@
<a4j:outputPanel id="list-body">
- <f:verbatim>
-
- </f:verbatim>
<h:dataTable id="carIndex" rows="10"
binding="#{inventoryList.carMakeIndexUIData}"
value="#{inventoryList.carMakeIndex}" var="category"
@@ -91,19 +88,20 @@
value="#{inventoryList.carInventory}" var="category"
rowClasses="list-row1, list-row2" columnClasses="column"
headerClass="list-header" styleClass="list-table2">
-
<h:column>
<f:facet name="header">
<h:outputText styleClass="headerText" value="Make" />
</f:facet>
<h:outputText value="#{category.make}" />
</h:column>
+
<h:column>
<f:facet name="header">
<h:outputText styleClass="headerText" value="Model" />
</f:facet>
<h:outputText value="#{category.model}" />
</h:column>
+
<h:column>
<f:facet name="header">
<h:outputText styleClass="headerText"
@@ -111,6 +109,7 @@
</f:facet>
<h:outputText value="#{category.price}" />
</h:column>
+
<h:column>
<f:facet name="header">
<h:outputText styleClass="headerText"
@@ -121,5 +120,12 @@
</h:dataTable>
</a4j:outputPanel>
</a4j:region>
+
+ <h:panelGrid columns="2">
+ <h:outputText value="Rendered" />
+ <h:selectBooleanCheckbox value="#{dfs.rendered}" onclick="submit();"/>
+ </h:panelGrid>
<h:commandLink value="Back" action="main"></h:commandLink>
- </a4j:form>
+
+
+ </h:form>
Modified: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DataFilterSlider.xml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DataFilterSlider.xml 2007-09-25 13:58:18 UTC (rev 3100)
+++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DataFilterSlider.xml 2007-09-25 13:58:37 UTC (rev 3101)
@@ -3,7 +3,7 @@
"http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
<faces-config>
<managed-bean>
- <managed-bean-name>mybean</managed-bean-name>
+ <managed-bean-name>dfs</managed-bean-name>
<managed-bean-class>dfs.DemoSliderBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
<managed-property>
16 years, 7 months
JBoss Rich Faces SVN: r3100 - in branches/3.1.x/ui/calendar/src/main: templates/org/richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2007-09-25 09:58:18 -0400 (Tue, 25 Sep 2007)
New Revision: 3100
Modified:
branches/3.1.x/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
branches/3.1.x/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
Log:
RF-955
RF-979
Modified: branches/3.1.x/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
===================================================================
--- branches/3.1.x/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-09-25 13:53:44 UTC (rev 3099)
+++ branches/3.1.x/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-09-25 13:58:18 UTC (rev 3100)
@@ -38,12 +38,15 @@
import javax.faces.el.MethodBinding;
import javax.faces.el.ValueBinding;
import javax.faces.event.AbortProcessingException;
+import javax.faces.event.ActionEvent;
import javax.faces.event.FacesEvent;
+import javax.faces.event.PhaseId;
import javax.faces.event.ValueChangeEvent;
import org.ajax4jsf.component.AjaxComponent;
import org.ajax4jsf.context.AjaxContext;
import org.ajax4jsf.event.AjaxEvent;
+import org.ajax4jsf.event.AjaxSingleEvent;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.richfaces.event.CurrentDateChangeEvent;
@@ -63,13 +66,13 @@
public static final String COMPONENT_TYPE = "org.richfaces.Calendar";
private static final String COMPONENT_FAMILY = "org.richfaces.Calendar";
-
+
public static final String AJAX_MODE = "ajax";
-
- public static final String CLIENT_MODE = "client";
-
+
+ public static final String CLIENT_MODE = "client";
+
private final static Log log = LogFactory.getLog(UICalendar.class);
-
+
public abstract Locale getLocale();
public abstract void setLocale(Locale locale);
@@ -125,7 +128,7 @@
public abstract boolean isPopup();
public abstract void setPopup(boolean popup);
-
+
public abstract boolean isDisabled();
public abstract void setDisabled(boolean disabled);
@@ -137,22 +140,30 @@
public abstract String getToolTipMode();
public abstract void setToolTipMode(String toolTipMode);
-
+
public abstract String getBoundaryDatesMode();
public abstract void setBoundaryDatesMode(String boundaryDatesMode);
-
+
public abstract MethodBinding getCurrentDateChangeListener();
- public abstract void setCurrentDateChangeListener(MethodBinding scrollerListener);
-
+ public abstract void setCurrentDateChangeListener(
+ MethodBinding scrollerListener);
+
public abstract String getMode();
public abstract void setMode(String mode);
-
-
- //TODO onclick add users onclick
+ public abstract int getVerticalOffset();
+
+ public abstract void setVerticalOffset(int verticalOffset);
+
+ public abstract int getHorizontalOffset();
+
+ public abstract void setHorizontalOffset(int horizontalOffset);
+
+ // TODO onclick add users onclick
+
// currentDate processing -------------------------------------------------
public Calendar getCalendar() {
@@ -194,12 +205,13 @@
} else {
setCurrentDate(currentDate);
}
-
+
} catch (Exception e) {
setValid(false);
- //XXX nick - kaa - add log.debug(...)
+ // XXX nick - kaa - add log.debug(...)
if (log.isDebugEnabled()) {
- log.debug(" updateCurrentDate method throws exception: "+e.toString(),e);
+ log.debug(" updateCurrentDate method throws exception: "
+ + e.toString(), e);
}
e.printStackTrace();
String messageString = e.toString();
@@ -278,14 +290,16 @@
calendar.clear();
calendar.set(Calendar.DATE, 1);
int idx = currentDateString.indexOf('/');
- if (idx != -1){
- calendar.set(Calendar.MONTH, Integer.parseInt(currentDateString
- .substring(0, idx)) - 1);
- calendar.set(Calendar.YEAR, Integer.parseInt(currentDateString
- .substring(idx + 1)));
+ if (idx != -1) {
+ calendar.set(Calendar.MONTH, Integer.parseInt(currentDateString
+ .substring(0, idx)) - 1);
+ calendar.set(Calendar.YEAR, Integer.parseInt(currentDateString
+ .substring(idx + 1)));
- return calendar.getTime();
- }else {return null;}
+ return calendar.getTime();
+ } else {
+ return null;
+ }
}
@@ -296,7 +310,9 @@
AjaxContext ajaxContext = AjaxContext
.getCurrentInstance(facesContext);
ajaxContext.addRegionsFromComponent(this);
- if(getPreload()!=null){ajaxContext.setResponseData(getPreload());}
+ if (getPreload() != null) {
+ ajaxContext.setResponseData(getPreload());
+ }
} else {
if (event instanceof CurrentDateChangeEvent) {
FacesContext facesContext = FacesContext.getCurrentInstance();
@@ -316,36 +332,40 @@
// method
// for more
- //XX nick - kaa - throw exception and review resulting message :)
-
+ // XX nick - kaa - throw exception and review resulting
+ // message :)
+
Date currentDate = convertCurrentDate(currentDateString);
CurrentDateChangeEvent newDateChangeEvent = new CurrentDateChangeEvent(
this, currentDate);
newDateChangeEvent.queue();
MethodBinding binding = getCurrentDateChangeListener();
-
- if(binding!=null){
-
- binding.invoke(facesContext, new Object[]{event});
+
+ if (binding != null) {
+
+ binding
+ .invoke(facesContext,
+ new Object[] { event });
}
-
-
-
- } catch (Exception e) {
+
+ } catch (Exception e) {
// XXX nick - kaa - add log.debug(...)
// XXX nick - kaa - we should stop processing on exc.
// setValid(false) and then call
// FacesContext.renderResponse(...)
// update model phase shouldn't start
if (log.isDebugEnabled()) {
- log.debug(" currentDate convertion fails with following exception: "+e.toString(),e);
+ log.debug(
+ " currentDate convertion fails with following exception: "
+ + e.toString(), e);
}
setValid(false);
String messageString = e.toString();
e.printStackTrace();
- FacesMessage message = new FacesMessage(messageString);
+ FacesMessage message = new FacesMessage(messageString);
message.setSeverity(FacesMessage.SEVERITY_ERROR);
- facesContext.addMessage(getClientId(facesContext),message);
+ facesContext.addMessage(getClientId(facesContext),
+ message);
facesContext.renderResponse();
}
@@ -380,8 +400,7 @@
HashMap args = new HashMap();
args.put("startDate", CalendarRendererBase
.formatDate(preloadDateRange[0]));
- args
- .put("days", calendarDataModelItems);
+ args.put("days", calendarDataModelItems);
return args;
}
}
@@ -392,37 +411,37 @@
public Date[] getPreloadDateRange() {
Date dateRangeBegin = this.getPreloadDateRangeBegin();
Date dateRangeEnd = this.getPreloadDateRangeEnd();
-
- if(dateRangeBegin==null&&dateRangeEnd==null){
+
+ if (dateRangeBegin == null && dateRangeEnd == null) {
return null;
- }
- else{
- if (dateRangeBegin.after(dateRangeEnd)) {
- // XXX add message
- FacesMessage message = new FacesMessage("preloadDateRangeBegin is greater than preloadDateRangeEnd");
- message.setSeverity(FacesMessage.SEVERITY_ERROR);
- FacesContext context = FacesContext.getCurrentInstance();
- context.addMessage(getClientId(context), message);
- throw new IllegalArgumentException();
- }
+ } else {
+ if (dateRangeBegin.after(dateRangeEnd)) {
+ // XXX add message
+ FacesMessage message = new FacesMessage(
+ "preloadDateRangeBegin is greater than preloadDateRangeEnd");
+ message.setSeverity(FacesMessage.SEVERITY_ERROR);
+ FacesContext context = FacesContext.getCurrentInstance();
+ context.addMessage(getClientId(context), message);
+ throw new IllegalArgumentException();
+ }
- List dates = new ArrayList();
+ List dates = new ArrayList();
- Calendar calendar = Calendar.getInstance(this.getTimeZone(), this
- .getLocale());
- Calendar calendar2 = (Calendar) calendar.clone();
- calendar.setTime(dateRangeBegin);
- calendar2.setTime(dateRangeEnd);
+ Calendar calendar = Calendar.getInstance(this.getTimeZone(), this
+ .getLocale());
+ Calendar calendar2 = (Calendar) calendar.clone();
+ calendar.setTime(dateRangeBegin);
+ calendar2.setTime(dateRangeEnd);
- do {
- dates.add(calendar.getTime());
- calendar.add(Calendar.DATE, 1);
- } while (!calendar.after(calendar2));
+ do {
+ dates.add(calendar.getTime());
+ calendar.add(Calendar.DATE, 1);
+ } while (!calendar.after(calendar2));
- return (Date[]) dates.toArray(new Date[dates.size()]);
+ return (Date[]) dates.toArray(new Date[dates.size()]);
+ }
}
- }
-
+
public void addCurrentDateChangeListener(CurrentDateChangeListener listener) {
addFacesListener(listener);
}
@@ -431,8 +450,10 @@
return (CurrentDateChangeListener[]) getFacesListeners(CurrentDateChangeListener.class);
}
- public void removeCurrentDateChangeListener(CurrentDateChangeListener listener) {
+ public void removeCurrentDateChangeListener(
+ CurrentDateChangeListener listener) {
removeFacesListener(listener);
- }
-
+ }
+
+
}
Modified: branches/3.1.x/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
===================================================================
--- branches/3.1.x/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-09-25 13:53:44 UTC (rev 3099)
+++ branches/3.1.x/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-09-25 13:58:18 UTC (rev 3100)
@@ -15,15 +15,23 @@
<div id="#{clientId}"
style="z-index: #{component.attributes['zindex']}; #{component.attributes['style']}"
- class="#{component.attributes['styleClass']}"
+ class="rich-calendar-popup #{component.attributes['styleClass']}"
x:passThruWithExclusions="value,name,type,id,styleClass,class,style">
<script
type="text/javascript">
new Calendar('#{clientId}', {
- submitFunction:
- <jsp:scriptlet>/*<![CDATA[*/
- writeSubmitFunction(context, component);
- /*]]>*/</jsp:scriptlet>,
+
+ <jsp:scriptlet>/*<![CDATA[*/
+ String mode = (String) component.getAttributes().get("mode");
+ if(org.richfaces.component.UICalendar.AJAX_MODE.equals(mode)){
+ /*]]>*/</jsp:scriptlet>
+
+ submitFunction: <jsp:scriptlet>/*<![CDATA[*/writeSubmitFunction(context, component);/*]]>*/</jsp:scriptlet>,
+
+ <jsp:scriptlet>/*<![CDATA[*/
+ }
+ /*]]>*/</jsp:scriptlet>
+
dayListTableId: '#{clientId}Day',
weekNumberBarId: '#{clientId}WeekNum',
weekDayBarId: '#{clientId}WeekDay',
@@ -38,6 +46,9 @@
enableManualInput: #{component.attributes['enableManualInput']},
showInput: #{component.attributes['showInput']},
disabled: #{component.disabled},
+ ajaxSingle: #{component.attributes['ajaxSingle']},
+ verticalOffset:'#{component.verticalOffset}',
+ horizontalOffset: '#{component.horizontalOffset}',
<f:call name="writeSymbols" />,
firstWeekDay: #{this:getFirstWeekDay(context, component)},
minDaysInFirstWeek: #{this:getMinDaysInFirstWeek(context, component)}
16 years, 7 months
JBoss Rich Faces SVN: r3099 - in trunk/ui/tree/src/main: templates and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-09-25 09:53:44 -0400 (Tue, 25 Sep 2007)
New Revision: 3099
Modified:
trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item.js
trunk/ui/tree/src/main/templates/htmlTree.jspx
Log:
http://jira.jboss.com/jira/browse/RF-993
Modified: trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item.js
===================================================================
--- trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item.js 2007-09-25 13:41:08 UTC (rev 3098)
+++ trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item.js 2007-09-25 13:53:44 UTC (rev 3099)
@@ -52,10 +52,17 @@
},
observeEvents: function(element) {
- var cells = element.rows[0].cells;
- //seeking by id seems to be miserably slow in IE than by index
- var eIcon = cells[this.elementID.icon];
- var eText = cells[this.elementID.text];
+ var eIcon = null;
+ var eText = null;
+ if ("NETSCAPE" == RichFaces.navigatorType()) {
+ eIcon = $(this.elementID.icon);
+ eText = $(this.elementID.text);
+ } else {
+ var cells = element.rows[0].cells;
+ //seeking by id seems to be miserably slow in IE than by index
+ eIcon = cells[this.elementID.icon];
+ eText = cells[this.elementID.text];
+ }
if (eIcon) {
Event.observe(eIcon, "mousedown", this.eventSelectionClick);
Event.observe(eIcon, "mouseout", this.eventMouseOut);
Modified: trunk/ui/tree/src/main/templates/htmlTree.jspx
===================================================================
--- trunk/ui/tree/src/main/templates/htmlTree.jspx 2007-09-25 13:41:08 UTC (rev 3098)
+++ trunk/ui/tree/src/main/templates/htmlTree.jspx 2007-09-25 13:53:44 UTC (rev 3099)
@@ -24,7 +24,8 @@
/org/richfaces/renderkit/html/scripts/tree-selection.js,
/org/richfaces/renderkit/html/scripts/tree-item.js,
/org/richfaces/renderkit/html/scripts/tree-item-dnd.js,
- /org/richfaces/renderkit/html/scripts/drag-indicator.js
+ /org/richfaces/renderkit/html/scripts/drag-indicator.js,
+ /org/richfaces/renderkit/html/scripts/browser_info.js
</h:scripts>
<f:clientId var="clientId" />
16 years, 7 months