[Mapbender-commits] r3134 - trunk/mapbender/http/javascripts

[svn_mapbender at osgeo.org]

Author: nimix
Date: 2008-10-07 03:47:26 -0400 (Tue, 07 Oct 2008)
New Revision: 3134

Modified:
   trunk/mapbender/http/javascripts/jsTree.js
Log:
update tree

Modified: trunk/mapbender/http/javascripts/jsTree.js
===================================================================
--- trunk/mapbender/http/javascripts/jsTree.js	2008-10-07 07:46:37 UTC (rev 3133)
+++ trunk/mapbender/http/javascripts/jsTree.js	2008-10-07 07:47:26 UTC (rev 3134)
@@ -227,7 +227,7 @@
 function _getState(tBody, path){
 	var hasSub = false
 	
-	for(var c = 0; c < tBody.childNodes.length; c++){
+	for(var c = 0; tBody!=null  && c < tBody.childNodes.length; c++){
 		var tr = tBody.childNodes[c]
 		if(childExists(tr) && isExpanded(tr)){
 			_getState(tBody.childNodes[c + 1].childNodes[1].firstChild.firstChild, path + (path != "" ? jst_delimiter[0] : "") + tr.id)
@@ -306,45 +306,23 @@
 	var parts = path.split(jst_delimiter[0])
 	var arrData = null;
 
-	for(var p = 0; p < parts.length; p++){
-		arrData = eval(ps);
-		for(var d = 0; d < arrData.length; d++){
-			if(parts[p] == arrData[d][0]){
-				if(p == parts.length - 1){
-					eval(ps)[d][1][3]=Img;
-					var nd = getDomNode(path);
-					if(nd){
-						var cb = nd.childNodes[1].childNodes[0];
-						if(cb && cb.nodeName=="IMG"){
-							if(Img)
-								cb.src=jst_image_folder+"/"+Img;
-							else if(eval(ps)[d][2]){
-								if(childExists(nd)){
-									var s = nd.nextSibling.style
-									if(s.display == ""){
-										cb.src = jst_image_folder + "/expanded_folder.png";
-									}else{
-										cb.src = jst_image_folder + "/closed_folder.png";
-									}
-								}else{
-									cb.src = jst_image_folder + "/expanded_folder.png";
-								}
-							}
-							else
-								rebuildNode(path, true);
-						}
-						else 
-							rebuildNode(path, true);
-					}
-					return true
+	var nd = getDomNode(path);
+	if(nd){
+		var cb = nd.childNodes[1].childNodes[0];
+		if(cb && cb.nodeName=="IMG"){
+			if(Img)
+				cb.src=jst_image_folder+"/"+Img;
+			else if(childExists(nd)){
+				var s = nd.nextSibling.style
+				if(s.display == ""){
+					cb.src = jst_image_folder + "/expanded_folder.png";
 				}else{
-					ps = ps + "[" + d + "][2]"
+					cb.src = jst_image_folder + "/closed_folder.png";
 				}
-				break;
 			}
 		}
 	}
-	return false
+	return true
 }
 
 function selectNode(path){
@@ -433,7 +411,6 @@
 		if(cb && cb.nodeName=="INPUT"){
 			cb.checked = bChk;
 			if(cb.onclick&&triggerOnclick)cb.onclick();
-//TODO DataNode anpassen
 			return true;
 		}
 	}
@@ -448,7 +425,6 @@
 		var cb = nd.childNodes[1].childNodes[ctrlNr];
 		if(cb && cb.nodeName=="INPUT"){
 			cb.disabled = !pEnabled;
-//TODO DataNode anpassen
 			return true;
 		}
 	}
@@ -526,7 +502,7 @@
 	n=n.childNodes[1].firstChild;
 	if(!n)return false;
 	return n.nodeName == "TABLE";
-	}
+}
 
 function getPath(strData){
 	if(strData.indexOf("[") > 0){
@@ -586,16 +562,12 @@
 			if(s.display == ""){
 				s.display = "none"
 				ctlImg.src = img1 + "closed.png"
-				if(eval(strData.substr(0, strData.length-3)+"[1][3]"))
-					fldImg.src = jst_image_folder + "/" + eval(strData.substr(0, strData.length-3)+"[1][3]");
-				else
+				if(String(fldImg.src).indexOf("expanded")!=-1)
 					fldImg.src = jst_image_folder + "/closed_folder.png";
 			}else{
 				s.display = ""
 				ctlImg.src = img1 + "expanded.png"
-				if(eval(strData.substr(0, strData.length-3)+"[1][3]"))
-					fldImg.src = jst_image_folder + "/" + eval(strData.substr(0, strData.length-3)+"[1][3]");
-				else
+				if(String(fldImg.src).indexOf("closed")!=-1)
 					fldImg.src = jst_image_folder + "/expanded_folder.png";
 			}
 			return