Merge "Update commit message when opening a change in relation chain"

polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js

diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
index d62ea04..adf48d1 100644
--- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
+++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
@@ -1759,6 +1759,7 @@
     }
 
     if (opt_isLocationChange) {
+      this._editingCommitMessage = false;
       const relatedChangesLoaded = coreDataPromise
           .then(() => this.$.relatedChanges.reload());
       allDataPromises.push(relatedChangesLoaded);

polygerrit-ui/app/elements/shared/gr-editable-content/gr-editable-content.js

diff --git a/polygerrit-ui/app/elements/shared/gr-editable-content/gr-editable-content.js b/polygerrit-ui/app/elements/shared/gr-editable-content/gr-editable-content.js
index a417e3f..458c6b0 100644
--- a/polygerrit-ui/app/elements/shared/gr-editable-content/gr-editable-content.js
+++ b/polygerrit-ui/app/elements/shared/gr-editable-content/gr-editable-content.js
@@ -65,6 +65,7 @@
       content: {
         notify: true,
         type: String,
+        observer: '_contentChanged',
       },
       disabled: {
         reflectToAttribute: true,
@@ -91,6 +92,14 @@
     };
   }
 
+  _contentChanged(content) {
+    /* A changed content means that either a different change has been loaded
+     * or new content was saved. Either way, let's reset the component.
+     */
+    this.editing = false;
+    this._newContent = '';
+  }
+
   focusTextarea() {
     this.shadowRoot.querySelector('iron-autogrow-textarea').textarea.focus();
   }