public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-15 10:46:32 +00:00
Code Issues Releases Wiki Activity

change how to use dataApi and fix indent

Browse Source
This commit is contained in:
Sosuke Suzuki
2017-04-25 02:31:03 +09:00
parent b73f0a8012
commit f8b7b7df9f
1 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
browser/main/SideNav/StorageItem.js
View File

@@ -148,10 +148,25 @@ class StorageItem extends React.Component {
const noteData = JSON.parse(e.dataTransfer.getData('note')) const noteData = JSON.parse(e.dataTransfer.getData('note'))
const newNoteData = Object.assign({}, noteData, {storage: storage, folder: folder.key}) const newNoteData = Object.assign({}, noteData, {storage: storage, folder: folder.key})
if(folder.key === noteData.folder) return if(folder.key === noteData.folder) return
console.log(location)
dataApi dataApi
.createNote(storage.key, newNoteData) .createNote(storage.key, newNoteData)
.then((note) => { .then((note) => {
dataApi
.deleteNote(noteData.storage, noteData.key)
.then((data) => {
let dispatchHandler = () => {
dispatch({
type: 'DELETE_NOTE',
storageKey: data.storageKey,
noteKey: data.noteKey
})
}
eventEmitter.once('list:moved', dispatchHandler)
eventEmitter.emit('list:next')
})
.catch((err) => {
console.error(err)
})
dispatch({ dispatch({
type: 'UPDATE_NOTE', type: 'UPDATE_NOTE',
note: note note: note
@@ -160,39 +175,24 @@ class StorageItem extends React.Component {
pathname: location.pathname, pathname: location.pathname,
query: {key: note.storage + '-' + note.key} query: {key: note.storage + '-' + note.key}
}) })
}) })
dataApi
.deleteNote(noteData.storage, noteData.key)
.then((data) => {
let dispatchHandler = () => {
dispatch({
type: 'DELETE_NOTE',
storageKey: data.storageKey,
noteKey: data.noteKey
})
}
eventEmitter.once('list:moved', dispatchHandler)
eventEmitter.emit('list:next')
})
} }
render () { render () {
let { storage, location, isFolded, data, dispatch } = this.props let { storage, location, isFolded, data, dispatch } = this.props
let { folderNoteMap } = data let { folderNoteMap } = data
let folderList = storage.folders.map((folder) => { let folderList = storage.folders.map((folder) => {
let isActive = !!(location.pathname.match(new RegExp('\/storages\/' + storage.key + '\/folders\/' + folder.key))) let isActive = !!(location.pathname.match(new RegExp('\/storages\/' + storage.key + '\/folders\/' + folder.key)))
let noteSet = folderNoteMap.get(storage.key + '-' + folder.key) let noteSet = folderNoteMap.get(storage.key + '-' + folder.key)
let noteCount = noteSet != null let noteCount = noteSet != null
? noteSet.size ? noteSet.size
: 0 : 0
return ( return (
<StorageItemChild <StorageItemChild
key={folder.key} key={folder.key}
isActive={isActive} isActive={isActive}
handleButtonClick={(e) => this.handleFolderButtonClick(folder.key)(e)} handleButtonClick={(e) => this.handleFolderButtonClick(folder.key)(e)}
handleContextMenu={(e) => this.handleFolderButtonContextMenu(e, folder)} handleContextMenu={(e) => this.handleFolderButtonContextMenu(e, folder)}
folderName={folder.name} folderName={folder.name}
folderColor={folder.color} folderColor={folder.color}