Fix tree issue when domain name contains 'plus'. Manual merge & close #…

…681
pydio · Jan 24, 2015 · 16d3e3f · 16d3e3f
1 parent f5f7820
commit 16d3e3f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer.js
diff --git a/core/src/plugins/gui.ajax/res/js/lib/webfx/xtree.js b/core/src/plugins/gui.ajax/res/js/lib/webfx/xtree.js
@@ -623,16 +623,13 @@ WebFXTreeItem.prototype.remove = function() {
 		prevSibling.open = false;
 		if($(prevSibling.id + '-plus'))
 		{
-			iconSrc = $(prevSibling.id + '-plus').src;
-			iconSrc = iconSrc.replace('minus', '').replace('plus', '');
-			$(prevSibling.id + '-plus').src = iconSrc;
-			prevSibling.setLabelIcon((webFXTreeHandler.all[prevSibling.id].icon?webFXTreeHandler.all[prevSibling.id].icon:webFXTreeConfig.fileIcon));
+            $(prevSibling.id + '-plus').src = this.zeroIcon;
+            prevSibling.setLabelIcon((webFXTreeHandler.all[prevSibling.id].icon?webFXTreeHandler.all[prevSibling.id].icon:webFXTreeConfig.fileIcon));
 		}
 	}
 	if ($(prevSibling.id + '-plus')) {
 		if (parentNode == prevSibling.parentNode) {
-			iconSrc = iconSrc.replace('minus', '').replace('plus', '');
-			$(prevSibling.id + '-plus').src = iconSrc;
+            $(prevSibling.id + '-plus').src = this.zeroIcon;
 		}
 	}
 } ;
@@ -804,7 +801,8 @@ WebFXTreeItem.prototype.toString = function (nItem, nItemCount) {
 	for (var i = 0; i < this.childNodes.length; i++) {
 		sb[i] = this.childNodes[i].toString(i,this.childNodes.length);
 	}
-	this.plusIcon = ((this.parentNode._last)?webFXTreeConfig.lPlusIcon:webFXTreeConfig.tPlusIcon);
+    this.zeroIcon = ((this.parentNode._last)?webFXTreeConfig.lIcon:webFXTreeConfig.tIcon);
+    this.plusIcon = ((this.parentNode._last)?webFXTreeConfig.lPlusIcon:webFXTreeConfig.tPlusIcon);
 	this.minusIcon = ((this.parentNode._last)?webFXTreeConfig.lMinusIcon:webFXTreeConfig.tMinusIcon);
 	return str + sb.join("") + "</div>";
 };