Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

maintain selection in refreshFileTree #6382

Merged
merged 5 commits into from
Jan 6, 2014
Merged
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions src/project/ProjectManager.js
Original file line number Diff line number Diff line change
@@ -1155,8 +1155,7 @@ define(function (require, exports, module) {
* fails to reload.
*/
function refreshFileTree() {
var selectedEntry,
deferred = new $.Deferred();
var selectedEntry;

if (_lastSelected) {
selectedEntry = _lastSelected.data("entry");
@@ -1165,20 +1164,15 @@ define(function (require, exports, module) {
}
_lastSelected = null;

_loadProject(getProjectRoot().fullPath, true)
return _loadProject(getProjectRoot().fullPath, true)
.then(function () {
if (selectedEntry) {
_findTreeNode(selectedEntry)
.then(function ($node) {
return _findTreeNode(selectedEntry)
.done(function ($node) {
_forceSelection(null, $node);
deferred.resolve();
}, deferred.reject);
} else {
deferred.resolve();
});
}
}, deferred.reject);

return deferred.promise();
});
}

/**