public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-11 08:46:20 +00:00
Code Issues Releases Wiki Activity

Use default value config.sortBy

Browse Source 
- for new folders
- for folders with no config set
This commit is contained in:
Mika Andrianarijaona
2018-08-11 11:44:22 +02:00
parent 47b0086bf8
commit cb956c5508
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
browser/main/NoteList/index.js
View File

@@ -912,9 +912,10 @@ class NoteList extends React.Component {
const { location, config, params: { folderKey } } = this.props const { location, config, params: { folderKey } } = this.props
let { notes } = this.props let { notes } = this.props
const { selectedNoteKeys } = this.state const { selectedNoteKeys } = this.state
const sortFunc = _.get(config, [folderKey, 'sortBy']) === 'CREATED_AT' const sortBy = _.get(config, [folderKey, 'sortBy'], config.sortBy)
const sortFunc = sortBy === 'CREATED_AT'
? sortByCreatedAt ? sortByCreatedAt
: _.get(config, [folderKey, 'sortBy']) === 'ALPHABETICAL' : sortBy === 'ALPHABETICAL'
? sortByAlphabetical ? sortByAlphabetical
: sortByUpdatedAt : sortByUpdatedAt
const sortedNotes = location.pathname.match(/\/starred|\/trash/) const sortedNotes = location.pathname.match(/\/starred|\/trash/)
@@ -965,7 +966,7 @@ class NoteList extends React.Component {
notes.length === 1 || notes.length === 1 ||
(autoSelectFirst && index === 0) (autoSelectFirst && index === 0)
const dateDisplay = moment( const dateDisplay = moment(
_.get(config, [folderKey, 'sortBy']) === 'CREATED_AT' sortBy === 'CREATED_AT'
? note.createdAt : note.updatedAt ? note.createdAt : note.updatedAt
).fromNow('D') ).fromNow('D')
@@ -1014,7 +1015,7 @@ class NoteList extends React.Component {
<i className='fa fa-angle-down' /> <i className='fa fa-angle-down' />
<select styleName='control-sortBy-select' <select styleName='control-sortBy-select'
title={i18n.__('Select filter mode')} title={i18n.__('Select filter mode')}
value={_.get(config, [folderKey, 'sortBy'])} value={sortBy}
onChange={(e) => this.handleSortByChange(e)} onChange={(e) => this.handleSortByChange(e)}
> >
<option title='Sort by update time' value='UPDATED_AT'>{i18n.__('Updated')}</option> <option title='Sort by update time' value='UPDATED_AT'>{i18n.__('Updated')}</option>