Mutable

INIT_ALL, NOTE_MOVE, NOTE_UPDATE(create/update) done

browser/main/Detail/MarkdownNoteDetail.js

@@ -35,6 +35,7 @@ class MarkdownNoteDetail extends React.Component {
 
   componentWillReceiveProps (nextProps) {
     if (nextProps.note.key !== this.props.note.key && !this.isMovingNote) {
+      if (this.saveQueue != null) this.saveNow()
       this.setState({
         note: Object.assign({}, nextProps.note),
         isDeleting: false
@@ -45,6 +46,10 @@ class MarkdownNoteDetail extends React.Component {
     }
   }
 
+  componentWillUnmount () {
+    if (this.saveQueue != null) this.saveNow()
+  }
+
   findTitle (value) {
     let splitted = value.split('\n')
     let title = null
@@ -91,17 +96,25 @@ class MarkdownNoteDetail extends React.Component {
   save () {
     clearTimeout(this.saveQueue)
     this.saveQueue = setTimeout(() => {
-      let { note, dispatch } = this.props
-      dispatch({
-        type: 'UPDATE_NOTE',
-        note: this.state.note
-      })
-
-      dataApi
-        .updateNote(note.storage, note.folder, note.key, this.state.note)
+      this.saveNow()
     }, 1000)
   }
 
+  saveNow () {
+    let { note, dispatch } = this.props
+    clearTimeout(this.saveQueue)
+    this.saveQueue = null
+
+    dataApi
+      .updateNote(note.storage, note.key, this.state.note)
+      .then((note) => {
+        dispatch({
+          type: 'UPDATE_NOTE',
+          note: note
+        })
+      })
+  }
+
   handleFolderChange (e) {
     let { note } = this.state
     let value = this.refs.folder.value
@@ -110,7 +123,7 @@ class MarkdownNoteDetail extends React.Component {
     let newFolderKey = splitted.shift()
 
     dataApi
-      .moveNote(note.storage, note.folder, note.key, newStorageKey, newFolderKey)
+      .moveNote(note.storage, note.key, newStorageKey, newFolderKey)
       .then((newNote) => {
         this.setState({
           isMovingNote: true,
@@ -119,13 +132,13 @@ class MarkdownNoteDetail extends React.Component {
           let { dispatch, location } = this.props
           dispatch({
             type: 'MOVE_NOTE',
-            note: note,
-            newNote: newNote
+            originNote: note,
+            note: newNote
           })
           hashHistory.replace({
             pathname: location.pathname,
             query: {
-              key: newNote.uniqueKey
+              key: newNote.storage + '-' + newNote.key
             }
           })
           this.setState({
@@ -210,7 +223,7 @@ class MarkdownNoteDetail extends React.Component {
   }
 
   render () {
-    let { storages, config } = this.props
+    let { data, config } = this.props
     let { note } = this.state
 
     return (
@@ -243,7 +256,7 @@ class MarkdownNoteDetail extends React.Component {
                 <FolderSelect styleName='info-left-top-folderSelect'
                   value={this.state.note.storage + '-' + this.state.note.folder}
                   ref='folder'
-                  storages={storages}
+                  data={data}
                   onChange={(e) => this.handleFolderChange(e)}
                 />
               </div>