- [DEV-137] minor fix in services tree (Artem)

git-svn-id: svn://svn.zabbix.com/trunk@5911 97f52cf1-0a1b-0410-bd0e-c28be96e8082

2 files changed, 14 insertions, 14 deletions

diff --git a/frontends/php/include/classes/ctree.inc.php b/frontends/php/include/classes/ctree.inc.php
index 7a423de2..e049d61b 100644
--- a/frontends/php/include/classes/ctree.inc.php
+++ b/frontends/php/include/classes/ctree.inc.php
@@ -221,7 +221,7 @@ var $maxlevel=0;
 				
 		foreach($this->tree as $id => $rows){
 			$parentid = $rows['parentid'];
-			$this->tree[$parentid]['nodelist'].=$id.';';
+			$this->tree[$parentid]['nodelist'].=$id.',';
 		}
 		
 		foreach($this->tree as $id => $rows){
diff --git a/frontends/php/js/tree.js b/frontends/php/js/tree.js
index f4138bac..2681dd00 100644
--- a/frontends/php/js/tree.js
+++ b/frontends/php/js/tree.js
@@ -21,7 +21,7 @@
 var tree ={
 init : function(){
 	if((tree_init = cookie.read(tree_name)) != null){
-		var nodes = tree_init.split(';');
+		var nodes = tree_init.split(',');
 		var c = nodes.length-1;
 		for(var i=0; i<c; i++){
 			this.onStartSetStatus(nodes[i]);
@@ -53,7 +53,7 @@ ChangeNodeStatus : function(id){
 		for(var i = 1; i < treenode.length; i++){
 			if(typeof(treenode[i]) != 'undefined'){
 				if(treenode[i].status == 'open'){
-					cookie_str+=i+';';
+					cookie_str+=i+',';
 				}
 			}
 		}
@@ -66,7 +66,7 @@ ChangeNodeStatus : function(id){
 
 closeSNodeX : function(id,img){
 	try{
-		nodelist = treenode[id].nodelist.split(';');
+		nodelist = treenode[id].nodelist.split(',');
 		if(this.getNodeStatus(id) == 'close'){
 			this.OpenNode(nodelist);
 			img.src = 'images/general/tree/minus.gif';
@@ -77,7 +77,7 @@ closeSNodeX : function(id,img){
 		}
 		this.ChangeNodeStatus(id);
 	} catch(e){
-//		alert('closeSNodeX: '+e);
+		throw('JSTree ERROR [closeSNodeX]: '+e);
 		return;
 	}
 },
@@ -88,11 +88,11 @@ OpenNode : function(nodelist){
 		for(var i=0; i<c; i++){
 			document.getElementById('id_'+nodelist[i]).style.display = (IE)?('block'):('table-row');
 			if(this.getNodeStatus(nodelist[i]) == 'open'){
-				this.OpenNode(treenode[nodelist[i]].nodelist.split(';'));
+				this.OpenNode(treenode[nodelist[i]].nodelist.split(','));
 			}
 		}
 	} catch(e){
-//		alert('OpenNode: '+e);
+		throw('JSTree ERROR [OpenNode]: '+e);
 	}
 },
 	
@@ -102,28 +102,28 @@ CloseNode : function(nodelist){
 		for(var i=0; i<c; i++){
 			document.getElementById('id_'+nodelist[i]).style.display = 'none';
 			if(this.getNodeStatus(nodelist[i]) == 'open'){
-				this.CloseNode(treenode[nodelist[i]].nodelist.split(';'));
+				this.CloseNode(treenode[nodelist[i]].nodelist.split(','));
 			}
 		}
 	} catch(e){ 
-//		alert('CloseNode: '+e);
+		throw('JSTree ERROR [CloseNode]: '+e);
 	}
 },
 
 onStartOpen : function(nodes){
-	var nodes = tree_init.split(';');
+	var nodes = tree_init.split(',');
 	var c = nodes.length-1;
 	for(var i=0; i<c;i++){
 		if(typeof(nodes[i]) != 'undefined'){
 			try{
 //				alert(nodes[i]+' : '+this.checkParent(nodes[i]));
 				if(this.checkParent(nodes[i])){
-					var nodelist = treenode[nodes[i]].nodelist.split(';');
+					var nodelist = treenode[nodes[i]].nodelist.split(',');
 					this.OpenNode(nodelist);
 				}
 			} catch(e){
 				cookie.erase(tree_name);
-//				alert('OnStartOpen: '+e);
+				throw('JSTree ERROR [OnStartOpen]: '+e);
 			}
 		}
 	}
@@ -138,7 +138,7 @@ onStartSetStatus : function(id){
 		
 		treenode[id].status = 'open';
 	} catch(e){
-		alert('OnStartSetStatus: '+e);
+		throw('JSTree ERROR [OnStartSetStatus]: '+e);
 	}
 },
 
@@ -155,7 +155,7 @@ checkParent : function(id){
 			return this.checkParent(treenode[id].parentid);
 		}
 	} catch(e){
-//		alert('checkPparent: '+e);
+		throw('JSTree ERROR [checkPparent]: '+e);
 	}
 }
 }