fix tree sync

vagnerleitte · Sep 3, 2012 · 964f9d0 · 964f9d0
1 parent da50bba
commit 964f9d0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/elfinder.src.html b/elfinder.src.html
@@ -153,7 +153,7 @@
 	<script>
 		$().ready(function() {
 			$('#finder').elfinder({
-				requestType : 'post',
+				// requestType : 'post',
 
 				// url : 'php/connector.php',
 				url : 'php/connector.php',

diff --git a/js/ui/tree.js b/js/ui/tree.js
@@ -302,15 +302,12 @@ $.fn.elfindertree = function(fm, opts) {
 
 				if (opts.syncTree) {
 					if (current.length) {
-						current.parentsUntil('.'+root).filter('.'+subtree).show().prev('.'+navdir).addClass(expanded);
-					} else if (fm.newAPI && !stopRec) {
-						// check if cwd is not in files
-						if ((dir = fm.file(cwd)).phash && tree.find('#'+fm.navHash2Id(dir.phash)).length) {
-							updateTree([dir]);
-						} else {
-							return;
-						}
-
+						return current.parentsUntil('.'+root).filter('.'+subtree).show().prev('.'+navdir).addClass(expanded);
+					}
+					if (fm.newAPI) {
+						// if ((dir = fm.file(cwd)).phash && tree.find('#'+fm.navHash2Id(dir.phash)).length) {
+							// updateTree([dir]);
+						// }
 						fm.request({
 							data : {cmd : 'parents', target : cwd},
 							preventFail : true
@@ -322,6 +319,7 @@ $.fn.elfindertree = function(fm, opts) {
 							cwd == fm.cwd().hash && sync(true);
 						});
 					}
+
 				}
 			},
 

diff --git a/php/elFinder.class.php b/php/elFinder.class.php
@@ -533,7 +533,7 @@ protected function open($args) {
 			return array('error' => $this->error(self::ERROR_OPEN, $hash, self::ERROR_PERM_DENIED));
 		}
 
-		$files = array($cwd);
+		$files = array();
 
 		// get folders trees
 		if ($args['tree']) {