Merge branch 'stable-3.0' into stable-3.1
* stable-3.0:
Don't render gr-comment-list when collapsed initially
Change-Id: I5af993fa73aee12ec1a8d7a9bd6bbb807fa2339f
diff --git a/polygerrit-ui/app/elements/change/gr-message/gr-message.html b/polygerrit-ui/app/elements/change/gr-message/gr-message.html
index da5eb39..8317e2f 100644
--- a/polygerrit-ui/app/elements/change/gr-message/gr-message.html
+++ b/polygerrit-ui/app/elements/change/gr-message/gr-message.html
@@ -200,15 +200,17 @@
class="message hideOnCollapsed"
content="[[message.message]]"
config="[[_projectConfig.commentlinks]]"></gr-formatted-text>
- <div class="replyContainer" hidden$="[[!showReplyButton]]" hidden>
- <gr-button link small on-click="_handleReplyTap">Reply</gr-button>
- </div>
- <gr-comment-list
- comments="[[comments]]"
- change-num="[[changeNum]]"
- patch-num="[[message._revision_number]]"
- project-name="[[projectName]]"
- project-config="[[_projectConfig]]"></gr-comment-list>
+ <template is="dom-if" if="[[_expanded]]">
+ <div class="replyContainer" hidden$="[[!showReplyButton]]" hidden>
+ <gr-button link small on-click="_handleReplyTap">Reply</gr-button>
+ </div>
+ <gr-comment-list
+ comments="[[comments]]"
+ change-num="[[changeNum]]"
+ patch-num="[[message._revision_number]]"
+ project-name="[[projectName]]"
+ project-config="[[_projectConfig]]"></gr-comment-list>
+ </template>
</div>
</template>
<template is="dom-if" if="[[_computeIsReviewerUpdate(message)]]">
diff --git a/polygerrit-ui/app/elements/change/gr-message/gr-message_test.html b/polygerrit-ui/app/elements/change/gr-message/gr-message_test.html
index cbdf9c9..a90e3ab 100644
--- a/polygerrit-ui/app/elements/change/gr-message/gr-message_test.html
+++ b/polygerrit-ui/app/elements/change/gr-message/gr-message_test.html
@@ -58,7 +58,7 @@
date: '2016-01-12 20:24:49.448000000',
message: 'Uploaded patch set 1.',
_revision_number: 1,
- expanded: false,
+ expanded: true,
};
element.addEventListener('reply', e => {
