opendev/gerrit
Code Issues Proposed changes

Merge "Don't show next arrow when there are not more changes on next page"

Browse Source
This commit is contained in:
Wyatt Allen 2017-02-23 23:42:33 +00:00 committed by Gerrit Code Review
commit de9f76de42
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view.html
View File

@ -62,7 +62,7 @@ limitations under the License.
hidden$="[[_hidePrevArrow(_offset)]]" hidden>&larr; Prev</a> hidden$="[[_hidePrevArrow(_offset)]]" hidden>&larr; Prev</a>
<a id="nextArrow" <a id="nextArrow"
href$="[[_computeNavLink(_query, _offset, 1, _changesPerPage)]]" href$="[[_computeNavLink(_query, _offset, 1, _changesPerPage)]]"
hidden$="[[_hideNextArrow(_loading, _changesPerPage)]]" hidden> hidden$="[[_hideNextArrow(_loading)]]" hidden>
Next &rarr;</a> Next &rarr;</a>
</nav> </nav>
</div> </div>

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

@ -134,8 +134,9 @@
return offset === 0; return offset === 0;
}, },
_hideNextArrow: function(loading, changesPerPage) { _hideNextArrow: function(loading) {
return loading || !this._changes || this._changes.length < changesPerPage; return loading || !this._changes || !this._changes.length ||
!this._changes[this._changes.length - 1]._more_changes;
}, },
_handleNextPage: function() { _handleNextPage: function() {

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

@ -86,16 +86,21 @@ limitations under the License.
test('_hideNextArrow', function() { test('_hideNextArrow', function() {
var loading = true; var loading = true;
var changesPerPage = 25; assert.isTrue(element._hideNextArrow(loading));
assert.isTrue(element._hideNextArrow(loading, changesPerPage));
loading = false; loading = false;
assert.isTrue(element._hideNextArrow(loading, changesPerPage)); assert.isTrue(element._hideNextArrow(loading));
element._changes = [];
assert.isTrue(element._hideNextArrow(loading));
element._changes = element._changes =
Array.apply(null, Array(5)).map(Number.prototype.valueOf, 0); Array.apply(null, Array(5)).map(Object.prototype.valueOf, {});
assert.isTrue(element._hideNextArrow(loading, changesPerPage)); assert.isTrue(element._hideNextArrow(loading));
element._changes = element._changes =
Array.apply(null, Array(25)).map(Number.prototype.valueOf, 0); Array.apply(null, Array(25)).map(Object.prototype.valueOf,
assert.isFalse(element._hideNextArrow(loading, changesPerPage)); {_more_changes: true});
assert.isFalse(element._hideNextArrow(loading));
element._changes =
Array.apply(null, Array(25)).map(Object.prototype.valueOf, {});
assert.isTrue(element._hideNextArrow(loading));
}); });
test('_handleNextPage', function() { test('_handleNextPage', function() {