From c69be5465576691d1c37914d2cbc87944dd6ccb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=98=D0=B2=D0=B0?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2?= Date: Wed, 4 Jul 2018 14:02:26 +0300 Subject: [PATCH] Fixing empty string searching --- browser/main/Detail/index.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/browser/main/Detail/index.js b/browser/main/Detail/index.js index 3e6e450e..75a3f91a 100644 --- a/browser/main/Detail/index.js +++ b/browser/main/Detail/index.js @@ -40,7 +40,7 @@ class Detail extends React.Component { let note = null if (location.query.key != null) { const noteKey = location.query.key - let displayedNotes, noteKeys + let displayedNotes = [] if (location.pathname.match(/\/home/) || location.pathname.match(/alltags/)) { displayedNotes = data.noteMap.map(note => note) @@ -49,10 +49,10 @@ class Detail extends React.Component { displayedNotes = data.starredSet.toJS().map(uniqueKey => data.noteMap.get(uniqueKey)) } if (location.pathname.match(/\/searched/)) { - displayedNotes = searchFromNotes( - data.noteMap.map(note => note), - params.searchword - ) + const searchStr = params.searchword + const allNotes = data.noteMap.map(note => note) + displayedNotes = searchStr === undefined || searchStr === '' ? allNotes + : searchFromNotes(allNotes, searchStr) } if (location.pathname.match(/\/trashed/)) { displayedNotes = data.trashedSet.toJS().map(uniqueKey => data.noteMap.get(uniqueKey)) @@ -64,7 +64,7 @@ class Detail extends React.Component { ) } - noteKeys = displayedNotes.map(note => note.key) + const noteKeys = displayedNotes.map(note => note.key) if (noteKeys.includes(noteKey)) { note = data.noteMap.get(noteKey) }