From d894bb4aab8979f835771ced8070a7513b20ca20 Mon Sep 17 00:00:00 2001
From: Andy Klimczak <andyklimczak@fastmail.com>
Date: Mon, 29 Jan 2018 21:51:57 -0500
Subject: [PATCH 1/3] Fix permanently deleting note

- Permanently deleting note would not remove note from list until after
refresh
- Fix so permanently deleted note is removed list
---
 browser/main/Detail/MarkdownNoteDetail.js | 3 +--
 browser/main/Detail/SnippetNoteDetail.js  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js
index 2dac51a6b..77a073551 100644
--- a/browser/main/Detail/MarkdownNoteDetail.js
+++ b/browser/main/Detail/MarkdownNoteDetail.js
@@ -210,10 +210,9 @@ class MarkdownNoteDetail extends React.Component {
         }, () => {
           this.save()
         })
-
-        ee.emit('list:next')
       }
     }
+    ee.emit('list:next')
   }
 
   handleUndoButtonClick (e) {
diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js
index af8c178ed..69e5f024b 100644
--- a/browser/main/Detail/SnippetNoteDetail.js
+++ b/browser/main/Detail/SnippetNoteDetail.js
@@ -203,10 +203,9 @@ class SnippetNoteDetail extends React.Component {
         }, () => {
           this.save()
         })
-
-        ee.emit('list:next')
       }
     }
+    ee.emit('list:next')
   }
 
   handleUndoButtonClick (e) {

From dc03bb76e6545f26654949474ff4262177c3940a Mon Sep 17 00:00:00 2001
From: Andy Klimczak <andyklimczak@fastmail.com>
Date: Tue, 30 Jan 2018 23:13:38 -0500
Subject: [PATCH 2/3] Fix

---
 browser/main/Detail/MarkdownNoteDetail.js | 4 +++-
 browser/main/Detail/SnippetNoteDetail.js  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js
index 77a073551..b964db660 100644
--- a/browser/main/Detail/MarkdownNoteDetail.js
+++ b/browser/main/Detail/MarkdownNoteDetail.js
@@ -200,6 +200,7 @@ class MarkdownNoteDetail extends React.Component {
             }
             ee.once('list:moved', dispatchHandler)
           })
+          .then(() => ee.emit('list:moved'))
       }
     } else {
       if (confirmDeletion()) {
@@ -210,9 +211,10 @@ class MarkdownNoteDetail extends React.Component {
         }, () => {
           this.save()
         })
+
+        ee.emit('list:next')
       }
     }
-    ee.emit('list:next')
   }
 
   handleUndoButtonClick (e) {
diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js
index 69e5f024b..37200156e 100644
--- a/browser/main/Detail/SnippetNoteDetail.js
+++ b/browser/main/Detail/SnippetNoteDetail.js
@@ -193,6 +193,7 @@ class SnippetNoteDetail extends React.Component {
             }
             ee.once('list:moved', dispatchHandler)
           })
+          .then(() => ee.emit('list:moved'))
       }
     } else {
       if (confirmDeletion()) {
@@ -203,9 +204,10 @@ class SnippetNoteDetail extends React.Component {
         }, () => {
           this.save()
         })
+
+        ee.emit('list:next')
       }
     }
-    ee.emit('list:next')
   }
 
   handleUndoButtonClick (e) {

From f04ad1e7023f90c69d89f51f8dce00d19cd112f1 Mon Sep 17 00:00:00 2001
From: Andy Klimczak <andyklimczak@fastmail.com>
Date: Wed, 31 Jan 2018 22:17:36 -0500
Subject: [PATCH 3/3] list:moved -> list:next

---
 browser/main/Detail/MarkdownNoteDetail.js | 4 ++--
 browser/main/Detail/SnippetNoteDetail.js  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js
index b964db660..bb76b8f33 100644
--- a/browser/main/Detail/MarkdownNoteDetail.js
+++ b/browser/main/Detail/MarkdownNoteDetail.js
@@ -198,9 +198,9 @@ class MarkdownNoteDetail extends React.Component {
                 noteKey: data.noteKey
               })
             }
-            ee.once('list:moved', dispatchHandler)
+            ee.once('list:next', dispatchHandler)
           })
-          .then(() => ee.emit('list:moved'))
+          .then(() => ee.emit('list:next'))
       }
     } else {
       if (confirmDeletion()) {
diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js
index 37200156e..9b85a59ec 100644
--- a/browser/main/Detail/SnippetNoteDetail.js
+++ b/browser/main/Detail/SnippetNoteDetail.js
@@ -191,9 +191,9 @@ class SnippetNoteDetail extends React.Component {
                 noteKey: data.noteKey
               })
             }
-            ee.once('list:moved', dispatchHandler)
+            ee.once('list:next', dispatchHandler)
           })
-          .then(() => ee.emit('list:moved'))
+          .then(() => ee.emit('list:next'))
       }
     } else {
       if (confirmDeletion()) {