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

Issue #4409: Incorrect sort order for untitled files #4524

Merged
merged 3 commits into from
Jul 22, 2013
Merged

Issue #4409: Incorrect sort order for untitled files #4524

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dddbd8f
Correct sort of Untitled documents
TomMalbran Jul 20, 2013
62399a7
Better fix using the options parameters in locale compare
TomMalbran Jul 20, 2013
7e457f2
Fix for extensions compare
TomMalbran Jul 22, 2013
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
4 changes: 2 additions & 2 deletions src/file/FileUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,14 +416,14 @@ define(function (require, exports, module) {
function compareFilenames(filename1, filename2, extFirst) {
var ext1 = getFilenameExtension(filename1),
ext2 = getFilenameExtension(filename2),
cmpExt = ext1.toLocaleLowerCase().localeCompare(ext2.toLocaleLowerCase()),
cmpExt = ext1.toLocaleLowerCase().localeCompare(ext2.toLocaleLowerCase(), undefined, {numeric: true}),
cmpNames;

if (brackets.platform === "win") {
filename1 = _getFilenameWithoutExtension(filename1);
filename2 = _getFilenameWithoutExtension(filename2);
}
cmpNames = filename1.toLocaleLowerCase().localeCompare(filename2.toLocaleLowerCase());
cmpNames = filename1.toLocaleLowerCase().localeCompare(filename2.toLocaleLowerCase(), undefined, {numeric: true});

return extFirst ? (cmpExt || cmpNames) : (cmpNames || cmpExt);
}
Expand Down