do not close tab if user aborted save action, fixed #38

egoist · Aug 18, 2016 · d149ba3 · d149ba3
1 parent a4ae125
commit d149ba3
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/src/components/main.vue b/src/components/main.vue
@@ -156,13 +156,16 @@
           const tab = this.tabs[index]
           if (tab.filePath) {
             await this.save({index, filePath: tab.filePath})
-          } else {
-            const filePath = remote.dialog.showSaveDialog(currentWindow, {
-              filters: [
-                {name: 'Markdown', extensions: ['markdown', 'md']}
-              ]
-            })
-            if (filePath) await this.save({index, filePath})
+            return true
+          }
+          const filePath = remote.dialog.showSaveDialog(currentWindow, {
+            filters: [
+              {name: 'Markdown', extensions: ['markdown', 'md']}
+            ]
+          })
+          if (filePath) {
+            await this.save({index, filePath})
+            return true
           }
         } catch (err) {
           handleError(err)
@@ -461,9 +464,11 @@
             buttons: ['Save', 'Cancel', 'Don\'t Save']
           })
           if (clickedButton === 0) {
-            await this.handleSave(index)
-            this.$store.dispatch('CLOSE_TAB', index)
-            return true
+            const saved = await this.handleSave(index)
+            if (saved) {
+              this.$store.dispatch('CLOSE_TAB', index)
+              return true
+            }
           } else if (clickedButton === 2) {
             this.$store.dispatch('UPDATE_SAVE_STATUS', {index, saved: true})
             this.$store.dispatch('CLOSE_TAB', index)