diff options
author | Bruno Wagner <bwagner@thoughtworks.com> | 2014-10-16 11:53:56 +0200 |
---|---|---|
committer | Bruno Wagner <bwagner@thoughtworks.com> | 2014-10-16 11:53:56 +0200 |
commit | eacd5fd5f7f47791ddc2e5568b8e4622420d8562 (patch) | |
tree | f303e7593c8eec8cc626b0df489b7e81128ca6dd /web-ui | |
parent | 693957054255b1807ae9c09478a06e191114b7fb (diff) |
#96 Mail searches are now paginated, the pages number start at 1 now
Diffstat (limited to 'web-ui')
4 files changed, 15 insertions, 15 deletions
diff --git a/web-ui/app/js/mail_list_actions/ui/pagination_trigger.js b/web-ui/app/js/mail_list_actions/ui/pagination_trigger.js index f9d531a4..3bc13d40 100644 --- a/web-ui/app/js/mail_list_actions/ui/pagination_trigger.js +++ b/web-ui/app/js/mail_list_actions/ui/pagination_trigger.js @@ -46,7 +46,7 @@ define( }; this.updatePageDisplay = function(event, data) { - this.renderWithPageNumber(data.currentPage + 1); + this.renderWithPageNumber(data.currentPage); }; this.previousPage = function(event) { diff --git a/web-ui/app/js/services/mail_service.js b/web-ui/app/js/services/mail_service.js index 2e877a2c..b773bd8b 100644 --- a/web-ui/app/js/services/mail_service.js +++ b/web-ui/app/js/services/mail_service.js @@ -38,8 +38,8 @@ define( singleMailResource: '/mail', currentTag: '', lastQuery: '', - currentPage: 0, - numPages: 0, + currentPage: 1, + numPages: 1, w: 25 }); @@ -150,7 +150,7 @@ define( this.fetchByTag = function (ev, data) { this.attr.currentTag = data.tag; - this.updateCurrentPageNumber(0); + this.updateCurrentPageNumber(1); this.fetchMail(compileQuery(data), this.attr.currentTag, false, data); }; @@ -223,7 +223,7 @@ define( }; this.previousPage = function () { - if (this.attr.currentPage > 0) { + if (this.attr.currentPage > 1) { this.updateCurrentPageNumber(this.attr.currentPage - 1); this.refreshResults(); } diff --git a/web-ui/test/spec/mail_list_actions/ui/pagination_trigger.spec.js b/web-ui/test/spec/mail_list_actions/ui/pagination_trigger.spec.js index bf47794a..d23c2839 100644 --- a/web-ui/test/spec/mail_list_actions/ui/pagination_trigger.spec.js +++ b/web-ui/test/spec/mail_list_actions/ui/pagination_trigger.spec.js @@ -21,6 +21,6 @@ describeComponent('mail_list_actions/ui/pagination_trigger', function () { it('re-renders with current page number when page changes', function () { this.component.trigger(document, Pixelated.events.ui.page.changed, {currentPage: 0}); - expect(this.component.select('currentPage').text()).toBe('1'); + expect(this.component.select('currentPage').text()).toBe('0'); }); }); diff --git a/web-ui/test/spec/services/mail_service.spec.js b/web-ui/test/spec/services/mail_service.spec.js index bce54857..85680cb6 100644 --- a/web-ui/test/spec/services/mail_service.spec.js +++ b/web-ui/test/spec/services/mail_service.spec.js @@ -210,21 +210,21 @@ describeComponent('services/mail_service', function () { }); it('changes to the previous page and refetch email when ui:page:previous is fired', function() { - this.component.attr.currentPage = 1; + this.component.attr.currentPage = 2; this.component.trigger(Pixelated.events.ui.page.previous); expect(this.component.fetchMail).toHaveBeenCalled(); - expect(this.component.attr.currentPage).toEqual(0); + expect(this.component.attr.currentPage).toEqual(1); }); it('won\'t change the page if it was already at the first page and trying to go to previous', function() { - this.component.attr.currentPage = 0; + this.component.attr.currentPage = 1; this.component.trigger(Pixelated.events.ui.page.previous); expect(this.component.fetchMail).not.toHaveBeenCalled(); - expect(this.component.attr.currentPage).toEqual(0); + expect(this.component.attr.currentPage).toEqual(1); }); it('changes to the next page and refetch email when ui:page:next is fired', function() { @@ -252,15 +252,15 @@ describeComponent('services/mail_service', function () { this.component.attr.numPages = 10; this.component.trigger(Pixelated.events.ui.page.next); - expect(pageChangedEvent).toHaveBeenTriggeredOnAndWith(document, {currentPage: 1, numPages: 10}); + expect(pageChangedEvent).toHaveBeenTriggeredOnAndWith(document, {currentPage: 2, numPages: 10}); }); it('triggers pageChanged event when going to previous page', function() { this.component.attr.numPages = 10; - this.component.attr.currentPage = 1; + this.component.attr.currentPage = 2; this.component.trigger(Pixelated.events.ui.page.previous); - expect(pageChangedEvent).toHaveBeenTriggeredOnAndWith(document, {currentPage: 0, numPages: 10}); + expect(pageChangedEvent).toHaveBeenTriggeredOnAndWith(document, {currentPage: 1, numPages: 10}); }); it('resets currentPage when fetching mails by tag', function() { @@ -268,8 +268,8 @@ describeComponent('services/mail_service', function () { this.component.attr.currentPage = 999; this.component.trigger(Pixelated.events.ui.mails.fetchByTag, {tag: 'inbox'}); - expect(this.component.attr.currentPage).toEqual(0); - expect(pageChangedEvent).toHaveBeenTriggeredOnAndWith(document, {currentPage: 0, numPages: 10}); + expect(this.component.attr.currentPage).toEqual(1); + expect(pageChangedEvent).toHaveBeenTriggeredOnAndWith(document, {currentPage: 1, numPages: 10}); }); describe('total page numbers', function() { |