From 0ccb465288863cbad4e6ea59a16cfeefea81a97e Mon Sep 17 00:00:00 2001 From: asmsuechan Date: Wed, 11 Oct 2017 13:35:24 +0900 Subject: [PATCH] Remove pinnedNotes from Folder --- browser/main/NoteList/index.js | 4 ++-- browser/main/lib/dataApi/createFolder.js | 3 +-- browser/main/lib/dataApi/updateFolder.js | 5 ----- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js index f953694c..80932652 100644 --- a/browser/main/NoteList/index.js +++ b/browser/main/NoteList/index.js @@ -293,8 +293,8 @@ class NoteList extends React.Component { let folder = _.find(storage.folders, {key: folderKey}) if (folder === undefined) return unorderedNotes - const pinnedNotes = unorderedNotes.filter((el) => { - return el.isPinned + const pinnedNotes = unorderedNotes.filter((note) => { + return note.isPinned }) return pinnedNotes.concat(unorderedNotes) diff --git a/browser/main/lib/dataApi/createFolder.js b/browser/main/lib/dataApi/createFolder.js index 69c27d38..9357e17c 100644 --- a/browser/main/lib/dataApi/createFolder.js +++ b/browser/main/lib/dataApi/createFolder.js @@ -44,8 +44,7 @@ function createFolder (storageKey, input) { let newFolder = { key, color: input.color, - name: input.name, - pinnedNotes: [] + name: input.name } storage.folders.push(newFolder) diff --git a/browser/main/lib/dataApi/updateFolder.js b/browser/main/lib/dataApi/updateFolder.js index 414e32b6..baddcb17 100644 --- a/browser/main/lib/dataApi/updateFolder.js +++ b/browser/main/lib/dataApi/updateFolder.js @@ -45,11 +45,6 @@ function updateFolder (storageKey, folderKey, input) { targetFolder.name = input.name targetFolder.color = input.color // For compativility - if (targetFolder.pinnedNotes) { - targetFolder.pinnedNotes.push(input.pinnedNote) - } else { - targetFolder.pinnedNotes = [input.pinnedNote] - } CSON.writeFileSync(path.join(storage.path, 'boostnote.json'), _.pick(storage, ['folders', 'version']))