commit d93f5b90b89b2737bdb111ec05d02dc8390ea32c
author Shawn Pearce <sop@google.com> Tue Jul 23 19:15:43 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 23 19:15:43 2013 +0000
tree 4a1f78e3846dc586be755c2115e322093c35f319
parent ceb04564474834d6fd820a7a95fddb044f1c5352
parent aabca1a45ea80ec984affbd432931f5cb2a57913

Merge "SideBySide2: Disable cancel button on new drafts with text"

gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DraftBox.java

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DraftBox.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DraftBox.java
index 25dcdf0..8d505ee 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DraftBox.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DraftBox.java
@@ -92,6 +92,9 @@
     expandTimer = new Timer() {
       @Override
       public void run() {
+        if (isNew()) {
+          cancel.setVisible(!isDirty());
+        }
         expandText();
       }
     };
@@ -291,7 +294,7 @@
   @UiHandler("cancel")
   void onCancel(ClickEvent e) {
     e.stopPropagation();
-    if (comment.id() == null && editArea.getValue().length() == 0) {
+    if (isNew() && !isDirty()) {
       removeUI();
     } else {
       setEdit(false);
@@ -302,7 +305,7 @@
   @UiHandler({"discard1", "discard2"})
   void onDiscard(ClickEvent e) {
     e.stopPropagation();
-    if (comment.id() == null) {
+    if (isNew()) {
       removeUI();
     } else {
       setEdit(false);
@@ -327,11 +330,30 @@
           onSave();
           return;
       }
-    } else if (e.getNativeKeyCode() == KeyCodes.KEY_ESCAPE
-        && comment.id() == null && editArea.getValue().length() == 0) {
-      removeUI();
-      return;
+    } else if (e.getNativeKeyCode() == KeyCodes.KEY_ESCAPE && !isDirty()) {
+      if (isNew()) {
+        removeUI();
+        return;
+      } else {
+        setEdit(false);
+        cm.focus();
+        return;
+      }
     }
     expandTimer.schedule(250);
   }
+
+  private boolean isNew() {
+    return comment.id() == null;
+  }
+
+  private boolean isDirty() {
+    String msg = editArea.getValue().trim();
+    if (isNew()) {
+      return msg.length() > 0;
+    }
+    return msg.equals(comment.message() != null
+        ? comment.message().trim()
+        : "");
+  }
 }