opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.16' into stable-3.0

Browse Source 
* stable-2.16:
  Fix "Show More" after change screen reloaded
  Hide overflowing author element content

Change-Id: I9d90759e8a05bce2c220c78b965da39481872745
This commit is contained in:
David Pursehouse
2019-05-10 08:50:28 +09:00
parent 6963085932 da21fa5ab2
commit 64a8bf4ada
3 changed files with 1 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
View File

@@ -861,10 +861,6 @@
this.set('_patchRange.patchNum', this._patchRange.patchNum || this.set('_patchRange.patchNum', this._patchRange.patchNum ||
this.computeLatestPatchNum(this._allPatchSets)); this.computeLatestPatchNum(this._allPatchSets));
// Reset the related changes toggle in the event it was previously
// displayed on an earlier change.
this._showRelatedToggle = false;
const title = change.subject + ' (' + change.change_id.substr(0, 9) + ')'; const title = change.subject + ' (' + change.change_id.substr(0, 9) + ')';
this.fire('title-change', {title}); this.fire('title-change', {title});
}, },

18
polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.html
View File

@@ -1258,24 +1258,6 @@ limitations under the License.
updateHeightSpy = sandbox.spy(element, '_updateRelatedChangeMaxHeight'); updateHeightSpy = sandbox.spy(element, '_updateRelatedChangeMaxHeight');
}); });
test('_showRelatedToggle is reset when a new change is loaded', () => {
element._patchRange = {};
assert.isFalse(element._showRelatedToggle);
element._showRelatedToggle = true;
element._change = {
change_id: 'Iad9dc96274af6946f3632be53b106ef80f7ba6ca',
_number: 42,
revisions: {
rev1: {_number: 1, commit: {parents: []}},
},
current_revision: 'rev1',
status: 'NEW',
labels: {},
actions: {},
};
assert.isFalse(element._showRelatedToggle);
});
test('relatedChangesToggle shown height greater than changeInfo height', test('relatedChangesToggle shown height greater than changeInfo height',
() => { () => {
assert.isFalse(element.$.relatedChangesToggle.classList assert.isFalse(element.$.relatedChangesToggle.classList

1
polygerrit-ui/app/elements/change/gr-message/gr-message.html
View File

@@ -120,6 +120,7 @@ limitations under the License.
position: static; position: static;
} }
.collapsed .author { .collapsed .author {
overflow: hidden;
color: var(--primary-text-color); color: var(--primary-text-color);
margin-right: .4em; margin-right: .4em;
} }