commit bed05854a7fe2d11f130a2f3f4936995908959b9
author Viktar Donich <viktard@google.com> Fri Aug 05 15:05:50 2016 -0700
committer Viktar Donich <viktard@google.com> Fri Aug 05 15:45:22 2016 -0700
tree daf4c1c29a4fa7fbaf8ad8b335effba18e938ebe
parent ae36556c54829b26eae1c7fe365f1a714abc087d

Cancel comment updates on discard

Fixes race condition triggering re-rendering of a deleted comment by
canceling debounced updates for `comment.editing` changes.

Bug: Issue 4319
Change-Id: I2a7578443783360088d6f65decd7dcb8be5e636b

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

diff --git a/polygerrit-ui/app/elements/diff/gr-diff-comment/gr-diff-comment.js b/polygerrit-ui/app/elements/diff/gr-diff-comment/gr-diff-comment.js
index a2d7fd0..1b30bde 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-comment/gr-diff-comment.js
+++ b/polygerrit-ui/app/elements/diff/gr-diff-comment/gr-diff-comment.js
@@ -280,6 +280,7 @@
     },
 
     _fireDiscard: function() {
+      this.cancelDebouncer('fire-update');
       this.fire('comment-discard', this._getEventPayload());
     },
 

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

diff --git a/polygerrit-ui/app/elements/diff/gr-diff-comment/gr-diff-comment_test.html b/polygerrit-ui/app/elements/diff/gr-diff-comment/gr-diff-comment_test.html
index 54dfad2..fcf8b41 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-comment/gr-diff-comment_test.html
+++ b/polygerrit-ui/app/elements/diff/gr-diff-comment/gr-diff-comment_test.html
@@ -194,15 +194,20 @@
       disabled = element.$$('.save').hasAttribute('disabled');
       assert.isTrue(disabled, 'save button should be disabled.');
 
+      var updateStub = sinon.stub();
+      element.addEventListener('comment-update', updateStub);
+
       var numDiscardEvents = 0;
       element.addEventListener('comment-discard', function(e) {
         numDiscardEvents++;
         if (numDiscardEvents == 3) {
+          assert.isFalse(updateStub.called);
           done();
         }
       });
       MockInteractions.tap(element.$$('.cancel'));
       MockInteractions.tap(element.$$('.discard'));
+      element.flushDebouncer('fire-update');
       MockInteractions.pressAndReleaseKeyOn(element.$.editTextarea, 27); // esc
     });