Merge pull request gitkraken#58 from afrisalyp/issue-33

Issue 33: Confirm delete dialog. gitkraken#57
noside911 · Oct 23, 2018 · 71db730 · 71db730
2 parents 457f6e4 + 72a7c19
commit 71db730
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 17 deletions.
diff --git a/bitbucket-comment-viewer-app/index.html b/bitbucket-comment-viewer-app/index.html
@@ -55,13 +55,15 @@
     }
 
     function del(data) {
-      ipcRenderer.send('delete.comment', {
-        Id: data.getAttribute('commentId'),
-        Line: data.getAttribute('line'),
-        Path: data.getAttribute('path'),
-        Message: data.getAttribute('message'),
-        Commit: JSON.parse(decodeURIComponent(data.getAttribute('commit')))
-      });
+      if (window.confirm('Are you sure to delete this comment?')) {
+        ipcRenderer.send('delete.comment', {
+          Id: data.getAttribute('commentId'),
+          Line: data.getAttribute('line'),
+          Path: data.getAttribute('path'),
+          Message: data.getAttribute('message'),
+          Commit: JSON.parse(decodeURIComponent(data.getAttribute('commit')))
+        });
+      }
     }
 
     var showdown = require('showdown'),

diff --git a/src/commands/addLineComments.ts b/src/commands/addLineComments.ts
@@ -268,17 +268,10 @@ export class AddLineCommentCommand extends ActiveEditorCachedCommand {
                     commentAppHelper.getComment();
                 }
                 if (args.type === operationTypes.Delete) {
-                    // delete comment.
-                    const pick = await window.showQuickPick(['Yes', 'No'], {
-                        placeHolder: 'Are you sure you want to delete this comment (Yes/No)?',
-                        ignoreFocusOut: true
+                    Container.commentService.deleteComment(args.commit!, args.id)
+                    .then(() => {
+                        Container.commentsDecorator.fetchComments();
                     });
-                    if (pick! === 'Yes') {
-                        Container.commentService.deleteComment(args.commit!, args.id)
-                        .then(() => {
-                            Container.commentsDecorator.fetchComments();
-                        });
-                    }
                 }
             }
             else {