Merge "Restore confirm discard dialog for draft comments"

polygerrit-ui/app/elements/diff/gr-diff-comment/gr-diff-comment.js

@@ -433,8 +433,8 @@
 
     _handleDiscard(e) {
       e.preventDefault();
-      if (this._computeSaveDisabled(this._messageText, this.comment,
-          this.resolved)) {
+
+      if (!this._messageText) {
         this._discardDraft();
         return;
       }

polygerrit-ui/app/elements/diff/gr-diff-comment/gr-diff-comment_test.html

@@ -531,27 +531,25 @@ limitations under the License.
     });
 
     suite('confirm discard', () => {
-      let saveDisabled;
       let discardStub;
       let overlayStub;
       let mockEvent;
 
       setup(() => {
-        sandbox.stub(element, '_computeSaveDisabled', () => saveDisabled);
         discardStub = sandbox.stub(element, '_discardDraft');
         overlayStub = sandbox.stub(element, '_openOverlay');
         mockEvent = {preventDefault: sinon.stub()};
       });
 
-      test('confirms discard of comments that can be saved', () => {
-        saveDisabled = false;
+      test('confirms discard of comments with message text', () => {
+        element._messageText = 'test';
         element._handleDiscard(mockEvent);
         assert.isTrue(overlayStub.calledWith(element.$.confirmDiscardOverlay));
         assert.isFalse(discardStub.called);
       });
 
-      test('no confirmation for comments that cannot be saved', () => {
-        saveDisabled = true;
+      test('no confirmation for comments without message text', () => {
+        element._messageText = '';
         element._handleDiscard(mockEvent);
         assert.isFalse(overlayStub.called);
         assert.isTrue(discardStub.calledOnce);