Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2024-09-21 15:56:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

In Preferences > Folders, decode path UTF7

Browse source
This commit is contained in:
Ben Gotow 2017-10-14 17:37:17 -07:00
parent e572e6d186
commit 6fa52ca823
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/internal_packages/category-mapper/lib/category-selection.jsx
View file

@ -1,3 +1,4 @@
import utf7 from 'utf7';
import { import {
RetinaImg, RetinaImg,
DropdownMenu, DropdownMenu,
@ -25,8 +26,8 @@ export default class CategorySelection extends React.Component {
_itemsForCategories() { _itemsForCategories() {
return this.props.all return this.props.all
.sort((a, b) => { .sort((a, b) => {
var pathA = a.path.toUpperCase(); var pathA = utf7.imap.decode(a.path).toUpperCase();
var pathB = b.path.toUpperCase(); var pathB = utf7.imap.decode(b.path).toUpperCase();
if (pathA < pathB) { if (pathA < pathB) {
return -1; return -1;
} }
@ -35,7 +36,7 @@ export default class CategorySelection extends React.Component {
} }
return 0; return 0;
}) })
.filter(c => Utils.wordSearchRegExp(this.state.searchValue).test(c.path)) .filter(c => Utils.wordSearchRegExp(this.state.searchValue).test(utf7.imap.decode(c.path)))
.map(c => { .map(c => {
c.backgroundColor = LabelColorizer.backgroundColorDark(c); c.backgroundColor = LabelColorizer.backgroundColorDark(c);
return c; return c;
@ -61,11 +62,13 @@ export default class CategorySelection extends React.Component {
); );
} }
const displayPath = utf7.imap.decode(item.path);
return ( return (
<div className="category-item"> <div className="category-item">
{icon} {icon}
<div className="category-display-name"> <div className="category-display-name">
<BoldedSearchResult value={item.path} query={this.state.searchValue || ''} /> <BoldedSearchResult value={displayPath} query={this.state.searchValue || ''} />
</div> </div>
</div> </div>
); );