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

Commit c1c05b8

Browse files
committed
Merge pull request #7162 from adobe/dangoor/7161-specrunner-exception
Fix #7161 by only refreshing when needed.
2 parents 858d146 + c137597 commit c1c05b8

1 file changed

Lines changed: 17 additions & 5 deletions

File tree

src/project/ProjectManager.js

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -201,15 +201,26 @@ define(function (require, exports, module) {
201201
*/
202202
var _allFilesCachePromise = null;
203203

204+
/**
205+
* @private
206+
* @type {boolean}
207+
* Current sort order for the tree, true if directories are first. This is
208+
* initialized in _generateSortPrefixes.
209+
*/
210+
var _dirFirst;
204211

205212
/**
206213
* @private
207214
* Generates the prefixes used for sorting the files in the project tree
215+
* @return {boolean} true if the sort prefixes have changed
208216
*/
209217
function _generateSortPrefixes() {
210-
var dirFirst = PreferencesManager.get("sortDirectoriesFirst");
211-
_sortPrefixDir = dirFirst ? "0" : "";
212-
_sortPrefixFile = dirFirst ? "1" : "";
218+
var previousDirFirst = _dirFirst;
219+
_dirFirst = PreferencesManager.get("sortDirectoriesFirst");
220+
_sortPrefixDir = _dirFirst ? "0" : "";
221+
_sortPrefixFile = _dirFirst ? "1" : "";
222+
223+
return previousDirFirst !== _dirFirst;
213224
}
214225

215226
/**
@@ -2207,8 +2218,9 @@ define(function (require, exports, module) {
22072218
// Initialize the sort prefixes and make sure to change them when the sort pref changes
22082219
_generateSortPrefixes();
22092220
PreferencesManager.on("change", "sortDirectoriesFirst", function () {
2210-
_generateSortPrefixes();
2211-
refreshFileTree();
2221+
if (_generateSortPrefixes()) {
2222+
refreshFileTree();
2223+
}
22122224
});
22132225

22142226
// Event Handlers

0 commit comments

Comments
 (0)