diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/AbstractPatchContentTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/AbstractPatchContentTable.java index 050dcb85d0..82a717173b 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/AbstractPatchContentTable.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/AbstractPatchContentTable.java @@ -86,8 +86,6 @@ public abstract class AbstractPatchContentTable extends NavigationTable keysComment = new KeyCommandSet(PatchUtil.C.commentEditorSet()); keysComment.add(new NoOpKeyCommand(KeyCommand.M_CTRL, 's', PatchUtil.C .commentSaveDraft())); - keysComment.add(new NoOpKeyCommand(KeyCommand.M_CTRL, 'd', PatchUtil.C - .commentDiscard())); keysComment.add(new NoOpKeyCommand(0, KeyCodes.KEY_ESCAPE, PatchUtil.C .commentCancelEdit())); } else { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/CommentEditorPanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/CommentEditorPanel.java index 73a3ec2279..98f55cdc7f 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/CommentEditorPanel.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/CommentEditorPanel.java @@ -102,18 +102,6 @@ public class CommentEditorPanel extends CommentPanel implements ClickHandler, event.preventDefault(); onSave(NULL_CALLBACK); return; - - case 'd': - case 'D': - event.preventDefault(); - if (isNew()) { - onDiscard(); - } else if (Window.confirm(PatchUtil.C.confirmDiscard())) { - onDiscard(); - } else { - text.setFocus(true); - } - return; } } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchConstants.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchConstants.java index 2524b3d71a..93e8deb44a 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchConstants.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchConstants.java @@ -24,7 +24,6 @@ public interface PatchConstants extends Constants { String buttonSave(); String buttonCancel(); String buttonDiscard(); - String confirmDiscard(); String noDifference(); String patchHeaderOld(); @@ -46,7 +45,6 @@ public interface PatchConstants extends Constants { String commentEditorSet(); String commentInsert(); String commentSaveDraft(); - String commentDiscard(); String commentCancelEdit(); String whitespaceIGNORE_NONE(); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchConstants.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchConstants.properties index fb52abd2c1..90def1d307 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchConstants.properties +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchConstants.properties @@ -7,7 +7,6 @@ buttonEdit = Edit buttonSave = Save buttonCancel = Cancel buttonDiscard = Discard -confirmDiscard = Discard this comment? noDifference = No Differences patchHeaderOld = Old Version @@ -28,7 +27,6 @@ expandComment = Expand or collapse comment commentEditorSet = Comment Editing commentInsert = Create a new inline comment commentSaveDraft = Save draft comment -commentDiscard = Discard draft comment commentCancelEdit = Cancel comment edit whitespaceIGNORE_NONE=None