Merge "Fix next/prev page event handlers on change list view"
This commit is contained in:
commit
e32ed73ac2
@ -57,10 +57,12 @@ limitations under the License.
|
|||||||
selected-index="{{viewState.selectedChangeIndex}}"
|
selected-index="{{viewState.selectedChangeIndex}}"
|
||||||
show-star="[[loggedIn]]"></gr-change-list>
|
show-star="[[loggedIn]]"></gr-change-list>
|
||||||
<nav>
|
<nav>
|
||||||
<a href$="[[_computeNavLink(_query, _offset, -1, _changesPerPage)]]"
|
<a id="prevArrow"
|
||||||
hidden$="[[_hidePrevArrow(_offset)]]" hidden>← Prev</a>
|
href$="[[_computeNavLink(_query, _offset, -1, _changesPerPage)]]"
|
||||||
<a href$="[[_computeNavLink(_query, _offset, 1, _changesPerPage)]]"
|
hidden$="[[_hidePrevArrow(_offset)]]" hidden>← Prev</a>
|
||||||
hidden$="[[_hideNextArrow(_loading, _changesPerPage)]]" hidden>
|
<a id="nextArrow"
|
||||||
|
href$="[[_computeNavLink(_query, _offset, 1, _changesPerPage)]]"
|
||||||
|
hidden$="[[_hideNextArrow(_loading, _changesPerPage)]]" hidden>
|
||||||
Next →</a>
|
Next →</a>
|
||||||
</nav>
|
</nav>
|
||||||
</div>
|
</div>
|
||||||
|
@ -139,13 +139,13 @@
|
|||||||
},
|
},
|
||||||
|
|
||||||
_handleNextPage: function() {
|
_handleNextPage: function() {
|
||||||
if (this._hideNextArrow(this._offset)) { return; }
|
if (this.$.nextArrow.hidden) { return; }
|
||||||
page.show(this._computeNavLink(
|
page.show(this._computeNavLink(
|
||||||
this._query, this._offset, 1, this._changesPerPage));
|
this._query, this._offset, 1, this._changesPerPage));
|
||||||
},
|
},
|
||||||
|
|
||||||
_handlePreviousPage: function() {
|
_handlePreviousPage: function() {
|
||||||
if (this._hidePrevArrow(this._offset)) { return; }
|
if (this.$.prevArrow.hidden) { return; }
|
||||||
page.show(this._computeNavLink(
|
page.show(this._computeNavLink(
|
||||||
this._query, this._offset, -1, this._changesPerPage));
|
this._query, this._offset, -1, this._changesPerPage));
|
||||||
},
|
},
|
||||||
|
@ -18,6 +18,7 @@ limitations under the License.
|
|||||||
<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
|
<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
|
||||||
<title>gr-change-list-view</title>
|
<title>gr-change-list-view</title>
|
||||||
|
|
||||||
|
<script src="../../../bower_components/page/page.js"></script>
|
||||||
<script src="../../../bower_components/webcomponentsjs/webcomponents-lite.min.js"></script>
|
<script src="../../../bower_components/webcomponentsjs/webcomponents-lite.min.js"></script>
|
||||||
<script src="../../../bower_components/web-component-tester/browser.js"></script>
|
<script src="../../../bower_components/web-component-tester/browser.js"></script>
|
||||||
|
|
||||||
@ -32,12 +33,18 @@ limitations under the License.
|
|||||||
<script>
|
<script>
|
||||||
suite('gr-change-list-view tests', function() {
|
suite('gr-change-list-view tests', function() {
|
||||||
var element;
|
var element;
|
||||||
|
var sandbox;
|
||||||
|
|
||||||
setup(function() {
|
setup(function() {
|
||||||
stub('gr-rest-api-interface', {
|
stub('gr-rest-api-interface', {
|
||||||
getLoggedIn: function() { return Promise.resolve(false); },
|
getLoggedIn: function() { return Promise.resolve(false); },
|
||||||
});
|
});
|
||||||
element = fixture('basic');
|
element = fixture('basic');
|
||||||
|
sandbox = sinon.sandbox.create();
|
||||||
|
});
|
||||||
|
|
||||||
|
teardown(function() {
|
||||||
|
sandbox.restore();
|
||||||
});
|
});
|
||||||
|
|
||||||
test('url is properly encoded', function() {
|
test('url is properly encoded', function() {
|
||||||
@ -50,5 +57,65 @@ limitations under the License.
|
|||||||
'/q/status:open+project:platform%252Fframeworks%252Fbase,25'
|
'/q/status:open+project:platform%252Fframeworks%252Fbase,25'
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('_computeNavLink', function() {
|
||||||
|
var query = 'status:open';
|
||||||
|
var offset = 0;
|
||||||
|
var direction = 1;
|
||||||
|
var changesPerPage = 5;
|
||||||
|
assert.equal(
|
||||||
|
element._computeNavLink(query, offset, direction, changesPerPage),
|
||||||
|
'/q/status:open,5');
|
||||||
|
direction = -1;
|
||||||
|
assert.equal(
|
||||||
|
element._computeNavLink(query, offset, direction, changesPerPage),
|
||||||
|
'/q/status:open');
|
||||||
|
offset = 5;
|
||||||
|
direction = 1;
|
||||||
|
assert.equal(
|
||||||
|
element._computeNavLink(query, offset, direction, changesPerPage),
|
||||||
|
'/q/status:open,10');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('_hidePrevArrow', function() {
|
||||||
|
var offset = 0;
|
||||||
|
assert.isTrue(element._hidePrevArrow(offset));
|
||||||
|
offset = 5;
|
||||||
|
assert.isFalse(element._hidePrevArrow(offset));
|
||||||
|
});
|
||||||
|
|
||||||
|
test('_hideNextArrow', function() {
|
||||||
|
var loading = true;
|
||||||
|
var changesPerPage = 25;
|
||||||
|
assert.isTrue(element._hideNextArrow(loading, changesPerPage));
|
||||||
|
loading = false;
|
||||||
|
assert.isTrue(element._hideNextArrow(loading, changesPerPage));
|
||||||
|
element._changes =
|
||||||
|
Array.apply(null, Array(5)).map(Number.prototype.valueOf, 0);
|
||||||
|
assert.isTrue(element._hideNextArrow(loading, changesPerPage));
|
||||||
|
element._changes =
|
||||||
|
Array.apply(null, Array(25)).map(Number.prototype.valueOf, 0);
|
||||||
|
assert.isFalse(element._hideNextArrow(loading, changesPerPage));
|
||||||
|
});
|
||||||
|
|
||||||
|
test('_handleNextPage', function() {
|
||||||
|
var showStub = sandbox.stub(page, 'show');
|
||||||
|
element.$.nextArrow.hidden = true;
|
||||||
|
element._handleNextPage();
|
||||||
|
assert.isFalse(showStub.called);
|
||||||
|
element.$.nextArrow.hidden = false;
|
||||||
|
element._handleNextPage();
|
||||||
|
assert.isTrue(showStub.called);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('_handlePreviousPage', function() {
|
||||||
|
var showStub = sandbox.stub(page, 'show');
|
||||||
|
element.$.prevArrow.hidden = true;
|
||||||
|
element._handlePreviousPage();
|
||||||
|
assert.isFalse(showStub.called);
|
||||||
|
element.$.prevArrow.hidden = false;
|
||||||
|
element._handlePreviousPage();
|
||||||
|
assert.isTrue(showStub.called);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
Loading…
Reference in New Issue
Block a user