1
0
mirror of https://github.com/BoostIo/Boostnote synced 2026-01-01 02:49:37 +00:00

search filter is now insensitive case, fix minor bugs

This commit is contained in:
Rokt33r
2016-01-08 19:12:37 +09:00
parent 09735b7f47
commit 32e6394b3f
7 changed files with 15 additions and 18 deletions

View File

@@ -18,7 +18,7 @@ import DeleteArticleModal from '../../modal/DeleteArticleModal'
import ArticleEditor from './ArticleEditor'
const electron = require('electron')
const ipc = electron.ipcRenderer
let count = 0
// const remote = electron.remote
// const { Menu, MenuItem } = remote
// const othersMenu = new Menu()
@@ -154,7 +154,7 @@ export default class ArticleDetail extends React.Component {
componentDidUpdate (prevProps, prevState) {
if (this.props.activeArticle == null || prevProps.activeArticle == null || this.props.activeArticle.key !== prevProps.activeArticle.key) {
this.refs.editor.resetCursorPosition()
if (this.refs.editor) this.refs.editor.resetCursorPosition()
}
}

View File

@@ -128,11 +128,11 @@ function buildFilter (key) {
}
function isContaining (target, needle) {
return target.match(new RegExp(_.escapeRegExp(needle)))
return target.match(new RegExp(_.escapeRegExp(needle), 'i'))
}
function startsWith (target, needle) {
return target.match(new RegExp('^' + _.escapeRegExp(needle)))
return target.match(new RegExp('^' + _.escapeRegExp(needle), 'i'))
}
function remap (state) {
@@ -170,10 +170,10 @@ function remap (state) {
let targetFolders
if (folders != null) {
let exactTargetFolders = folders.filter(folder => {
return _.findWhere(folderExactFilters, {value: folder.name})
return _.find(folderExactFilters, filter => filter.value.toLowerCase() === folder.name.toLowerCase())
})
let fuzzyTargetFolders = folders.filter(folder => {
return _.find(folderFilters, filter => startsWith(folder.name, filter.value))
return _.find(folderFilters, filter => startsWith(folder.name.replace(/_/g, ''), filter.value.replace(/_/g, '')))
})
targetFolders = status.targetFolders = exactTargetFolders.concat(fuzzyTargetFolders)