You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2006/05/31 16:24:02 UTC
svn commit: r410537 - in /myfaces/tobago/trunk/theme/scarborough/src/main:
java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/
resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/
Author: weber
Date: Wed May 31 07:24:02 2006
New Revision: 410537
URL: http://svn.apache.org/viewvc?rev=410537&view=rev
Log:
working on disabled treeNodes
Modified:
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tree.js
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java?rev=410537&r1=410536&r2=410537&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java Wed May 31 07:24:02 2006
@@ -181,7 +181,7 @@
String debuging = null;
- writer.writeText("var ", null);
+ writer.writeText(" var ", null);
writer.writeText(jsClientId, null);
writer.writeText(" = new ", null);
if (component.getChildCount() == 0) {
@@ -268,6 +268,7 @@
writer.writeText(",treeResourcesHelp);\n", null);
if (jsParentClientId != null) { // if not the root node
+ writer.writeText(" ", null);
writer.writeText(jsParentClientId, null);
writer.writeText(".add(", null);
writer.writeText(jsClientId, null);
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeRenderer.java?rev=410537&r1=410536&r2=410537&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeRenderer.java Wed May 31 07:24:02 2006
@@ -41,6 +41,9 @@
import javax.faces.context.FacesContext;
import java.io.IOException;
import java.io.StringWriter;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.StringTokenizer;
public class TreeRenderer extends RendererBase {
@@ -52,7 +55,9 @@
"openfoldericon.gif",
"foldericon.gif",
"unchecked.gif",
+ "uncheckedDisabled.gif",
"checked.gif",
+ "checkedDisabled.gif",
"new.gif",
"T.gif",
"L.gif",
@@ -169,7 +174,7 @@
// writer.endElement("div");
- String script = createJavascript(facesContext, clientId, root);
+ String script[] = createJavascript(facesContext, clientId, root);
final String[] scripts = {"script/tree.js"};
ComponentUtil.findPage(tree).getScriptFiles().add(scripts[0]);
@@ -179,54 +184,59 @@
writer.writeText(script, null);
HtmlRendererUtil.endJavascript(writer);
} else {
- HtmlRendererUtil.writeScriptLoader(facesContext, scripts,
- new String[] {script.replaceAll("\n", " ")});
+ HtmlRendererUtil.writeScriptLoader(facesContext, scripts, script);
}
writer.endElement("div");
}
- private String createJavascript(FacesContext facesContext, String clientId,
+ private String[] createJavascript(FacesContext facesContext, String clientId,
UITreeNode root)
throws IOException {
StringBuffer sb = new StringBuffer();
- sb.append("{");
+ sb.append("{\n");
- sb.append("var treeResourcesHelp = new Object();\n");
+ sb.append(" var treeResourcesHelp = new Object();\n");
for (int i = 0; i < TREE_IMAGES.length; i++) {
- sb.append("treeResourcesHelp.");
- sb.append(TREE_IMAGES[i].replace('.', '_'));
- sb.append(" = \"");
+ sb.append(" treeResourcesHelp[\"");
+ sb.append(TREE_IMAGES[i]);
+ sb.append("\"] = \"");
sb.append(ResourceManagerUtil.getImageWithPath(facesContext, "image/" + TREE_IMAGES[i]));
sb.append("\";\n");
}
- sb.append("treeResourcesHelp.getImage = function (name) {\n");
- sb.append(" var result = this[name.replace('.', '_')];\n");
- sb.append(" if (result) {\n");
- sb.append(" return result;\n");
- sb.append(" } else {\n");
- sb.append(" return \"");
+ sb.append(" \n treeResourcesHelp.getImage = function (name) {\n");
+ sb.append(" var result = this[name];\n");
+ sb.append(" if (result) {\n");
+ sb.append(" return result;\n");
+ sb.append(" } else {\n");
+ sb.append(" return \"");
sb.append(ResourceManagerUtil.getImageWithPath(facesContext, "image/blank.gif"));
sb.append("\";\n");
- sb.append(" }\n");
- sb.append("};\n");
+ sb.append(" }\n");
+ sb.append(" };\n \n");
sb.append(getNodesAsJavascript(facesContext, root));
sb.append(" var treeDiv = document.getElementById('");
sb.append(clientId);
sb.append("-cont');\n");
- sb.append("treeDiv.innerHTML = ");
+ sb.append(" treeDiv.innerHTML = ");
String rootNode = createJavascriptVariable(root.getClientId(facesContext));
sb.append(rootNode);
- sb.append(".toString(0, true);\n");
+ sb.append(".toString(0, true);\n ");
sb.append(rootNode);
sb.append(".initSelection();\n");
sb.append("}");
- return sb.toString();
+// return sb.toString();
+ StringTokenizer tokenizer = new StringTokenizer(sb.toString(), "\n");
+ String[] strings = new String[tokenizer.countTokens()];
+ for (int i = 0 ; i < strings.length; i++) {
+ strings[i] = tokenizer.nextToken();
+ }
+ return strings;
}
protected String getNodesAsJavascript(FacesContext facesContext, UITreeNode root) throws IOException {
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tree.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tree.js?rev=410537&r1=410536&r2=410537&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tree.js (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tree.js Wed May 31 07:24:02 2006
@@ -338,15 +338,17 @@
var markIconOnClick = '';
if (selectable) {
if (selected) {
- markIcon = treeResources.getImage("checked.gif");
+ markIcon = treeResources.getImage("checked" + (this.disabled ? "Disabled" : "") + ".gif");
} else {
- markIcon = treeResources.getImage("unchecked.gif");
+ markIcon = treeResources.getImage("unchecked" + (this.disabled ? "Disabled" : "") + ".gif");
+ }
+ if (!this.disabled) {
+ markIconOnClick
+ = 'onclick="toggleSelect(this.parentNode, \'' + treeHiddenId
+ + '\', \'' + treeResources.getImage("unchecked.gif")
+ + '\', \'' + treeResources.getImage("checked.gif")
+ + '\')"';
}
- markIconOnClick
- = 'onclick="toggleSelect(this.parentNode, \'' + treeHiddenId
- + '\', \'' + treeResources.getImage("unchecked.gif")
- + '\', \'' + treeResources.getImage("checked.gif")
- + '\')"';
}
if (marked) {
storeMarker(this, treeHiddenId);
@@ -495,16 +497,18 @@
markIcon = treeResources.getImage("1x1.gif");
} else {
if (selected) {
- markIcon = treeResources.getImage("checked.gif");
+ markIcon = treeResources.getImage("checked" + this.disabled ? "Disabled" : "" + ".gif");
} else {
- markIcon = treeResources.getImage("unchecked.gif");
+ markIcon = treeResources.getImage("unchecked" + this.disabled ? "Disabled" : "" + ".gif");
}
- markIconOnClickFunction
- = 'onclick="toggleSelect(this.parentNode, \'' + treeHiddenId
- + '\', \'' + treeResources.getImage("unchecked.gif")
- + '\', \'' + treeResources.getImage("checked.gif")
- + '\')"';
+ if (!this.disabled) {
+ markIconOnClickFunction
+ = 'onclick="toggleSelect(this.parentNode, \'' + treeHiddenId
+ + '\', \'' + treeResources.getImage("unchecked.gif")
+ + '\', \'' + treeResources.getImage("checked.gif")
+ + '\')"';
}
+ }
}
actualIcon = (this.expanded ? this.openIcon : this.icon) ;