fixes Studio-42#380

yhtsnda · Sep 6, 2012 · 9714baa · 9714baa
1 parent bfe9c66
commit 9714baa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/js/elFinder.js b/js/elFinder.js
@@ -1083,7 +1083,6 @@ window.elFinder = function(node, opts) {
 				preventDefault : true
 			};
 
-
 		$.when(
 			this.request(opts1),
 			this.request(opts2)
@@ -1098,6 +1097,7 @@ window.elFinder = function(node, opts) {
 		.done(function(odata, pdata) {
 			var diff = self.diff(odata.files.concat(pdata && pdata.tree ? pdata.tree : []));
 
+			diff.added.push(odata.cwd)
 			diff.removed.length && self.remove(diff);
 			diff.added.length   && self.add(diff);
 			diff.changed.length && self.change(diff);

diff --git a/js/ui/tree.js b/js/ui/tree.js
@@ -305,7 +305,8 @@ $.fn.elfindertree = function(fm, opts) {
 						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) {
+						dir = fm.file(cwd);
+						if (dir && dir.phash && tree.find('#'+fm.navHash2Id(dir.phash)).length) {
 							updateTree([dir]);
 							return sync();
 						}
@@ -318,7 +319,8 @@ $.fn.elfindertree = function(fm, opts) {
 							updateTree(dirs);
 							updateArrows(dirs, loaded);
 							cwd == fm.cwd().hash && sync(true);
-						});
+						})
+						;
 					}
 
 				}