Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

6.9 Fix tree node locator to work with umlauts correctly #28

Open
wants to merge 1 commit into
base: 6.9
Choose a base branch
from
Open

6.9 Fix tree node locator to work with umlauts correctly #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions bundles/AdminBundle/Resources/public/js/pimcore/treenodelocator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,11 +472,14 @@ pimcore.treenodelocator = function()
return -1;
}

if (firstElementChild && elementKey.toUpperCase() < firstElementChild.data.text.toUpperCase()) {
// Cando fix: simple string comparison is not working as expected, because umlauts and special characters
// will be sort by their ASCII codes. In that case we have to use the upper case version of the string
// with the locale compare function. Should this be extended with the admin ui locale?
if (firstElementChild && elementKey.toUpperCase().localeCompare(firstElementChild.data.text.toUpperCase()) === -1) {
return -1;
}

if (lastElementChild && elementKey.toUpperCase() > lastElementChild.data.text.toUpperCase()) {
if (lastElementChild && elementKey.toUpperCase().localeCompare(lastElementChild.data.text.toUpperCase()) === 1) {
return 1;
}

Expand Down
Loading