Skip to content

Improve searching #954

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

Merged
merged 13 commits into from
Oct 13, 2017
Merged

Improve searching #954

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b4f5913
Fix to work inputting by IME on search
asmsuechan Oct 10, 2017
6e480ba
Add comments
asmsuechan Oct 10, 2017
4418617
Delete a unnecessary break
asmsuechan Oct 10, 2017
2511512
Improve context search
asmsuechan Oct 11, 2017
70468b6
Change contextNotes a state to a variable because of lifesycle loop
asmsuechan Oct 11, 2017
da6b8c3
Improve some
asmsuechan Oct 12, 2017
df3195f
Refactor getContextNotes()
asmsuechan Oct 12, 2017
93e188d
Change to be able to search on starred
asmsuechan Oct 12, 2017
49243a8
Add to handle space key on search
asmsuechan Oct 12, 2017
15dc424
Change keycode handling scope due to global keyboard support
asmsuechan Oct 12, 2017
caa5dea
Change searching by tag
asmsuechan Oct 13, 2017
78b12ae
Add test
asmsuechan Oct 13, 2017
7ab4821
Improve tag search by changing the logic
asmsuechan Oct 13, 2017
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
Prev Previous commit
Next Next commit
Change searching by tag
  • Loading branch information
@asmsuechan
asmsuechan committed Oct 13, 2017
commit caa5deac4eb4989ef38646bf10c16552626bc4e4
10 changes: 5 additions & 5 deletions browser/lib/search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ import _ from 'lodash'

export default function searchFromNotes (notes, search) {
if (search.trim().length === 0) return []
let searchBlocks = search.split(' ')
const searchBlocks = search.split(' ').filter(block => { return block !== '' })
let foundNotes = []
searchBlocks.forEach((block) => {
foundNotes = findByWord(notes, block)
if (block.match(/^#.+/)) {
notes = findByTag(notes, block)
} else {
notes = findByWord(notes, block)
foundNotes = foundNotes.concat(findByTag(notes, block))
}
})
return notes
return foundNotes
}

function findByTag (notes, block) {
Expand Down