[richfaces-svn-commits] JBoss Rich Faces SVN: r1687 - in trunk/ui/tree/src/main: resources/org/richfaces/renderkit/html/css and 1 other directories.
Author: nbelaevski
Date: 2007-07-18 15:10:54 -0400 (Wed, 18 Jul 2007)
New Revision: 1687
Modified:
trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java
trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss
trunk/ui/tree/src/main/templates/htmlTree.jspx
trunk/ui/tree/src/main/templates/htmlTreeNode.jspx
Log:
- nowrap="nowrap" switched to CSS equivalent
- removed excess "return false;" in toggle script
Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2007-07-18
19:09:14 UTC (rev 1686)
+++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2007-07-18
19:10:54 UTC (rev 1687)
@@ -96,7 +96,7 @@
StringBuffer buffer = new StringBuffer();
function.appendScript(buffer);
- buffer.append("; return false;");
+ buffer.append(";");
return buffer.toString();
} else if (UITree.SWITCH_SERVER.equals(tree.getSwitchType())) {
String paramName = id + NODE_EXPANDED_INPUT_SUFFIX;
Modified: trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss
===================================================================
--- trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss 2007-07-18
19:09:14 UTC (rev 1686)
+++ trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss 2007-07-18
19:10:54 UTC (rev 1687)
@@ -44,6 +44,7 @@
width: 100%;
cursor: default;
padding : 1px 4px 1px 4px;
+ white-space: nowrap;
}
.dr-tree-h-text-span {
Modified: trunk/ui/tree/src/main/templates/htmlTree.jspx
===================================================================
--- trunk/ui/tree/src/main/templates/htmlTree.jspx 2007-07-18 19:09:14 UTC (rev 1686)
+++ trunk/ui/tree/src/main/templates/htmlTree.jspx 2007-07-18 19:10:54 UTC (rev 1687)
@@ -16,7 +16,6 @@
<h:scripts>
new org.ajax4jsf.javascript.PrototypeScript(),
new org.ajax4jsf.javascript.AjaxScript(),
- /org/ajax4jsf/framework/ajax/scripts/AJAX.js,
/org/richfaces/renderkit/html/scripts/utils.js,
/org/ajax4jsf/javascript/scripts/form.js,
/org/richfaces/renderkit/html/scripts/form.js,
Modified: trunk/ui/tree/src/main/templates/htmlTreeNode.jspx
===================================================================
--- trunk/ui/tree/src/main/templates/htmlTreeNode.jspx 2007-07-18 19:09:14 UTC (rev 1686)
+++ trunk/ui/tree/src/main/templates/htmlTreeNode.jspx 2007-07-18 19:10:54 UTC (rev 1687)
@@ -200,7 +200,7 @@
</td>
<td class="dr-tree-h-text rich-tree-node
#{component.attributes['nodeClass']}"
rich:selectedclass="#{selectedClass}"
rich:highlightedclass="#{highlightedClass}"
- id="#{clientId}:text" nowrap="nowrap">
+ id="#{clientId}:text">
<vcp:body />
</td>
</tr>