Skip to content

Pin to top #956

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 17 commits into from
Oct 13, 2017
Merged

Pin to top #956

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
fe8045c
Add pinn to top
asmsuechan Oct 13, 2017
8fd4deb
Add unpin
asmsuechan Oct 11, 2017
0ccb465
Remove pinnedNotes from Folder
asmsuechan Oct 11, 2017
5433abd
Remove console.log
asmsuechan Oct 11, 2017
6440395
Change to use strict equation
asmsuechan Oct 13, 2017
0e312ba
Change name Pinn to Pin
asmsuechan Oct 11, 2017
f337024
Add conditions to hide pin from /home, /starred or /trash
asmsuechan Oct 13, 2017
d915d19
Add comment for NoteItem
asmsuechan Oct 12, 2017
c33da0c
Fix some pointed by eslint
asmsuechan Oct 12, 2017
725c6a7
Resolve conflicts
asmsuechan Oct 13, 2017
2415fbf
Change to use const instead of let
asmsuechan Oct 13, 2017
3027cc8
Add handleNoteDelete
asmsuechan Oct 13, 2017
03fc453
Change method names
asmsuechan Oct 13, 2017
9bca133
Remove updateFolder because it's no longer used
asmsuechan Oct 13, 2017
f9b3284
Fix a condition
asmsuechan Oct 13, 2017
2003bea
Remove unnecessary lines
asmsuechan Oct 13, 2017
d274563
Change order for pinned notes on /home, /trashed, /searched or /starred
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
Remove pinnedNotes from Folder
  • Loading branch information
@asmsuechan
asmsuechan committed Oct 13, 2017
commit 0ccb465288863cbad4e6ea59a16cfeefea81a97e
4 changes: 2 additions & 2 deletions browser/main/NoteList/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions browser/main/lib/dataApi/createFolder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 0 additions & 5 deletions browser/main/lib/dataApi/updateFolder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']))

Expand Down