From 3bb0a9c8735cad62442adf6119242eef8ccc67bd Mon Sep 17 00:00:00 2001 From: Simon Knox Date: Tue, 28 Mar 2017 16:27:55 +1100 Subject: [PATCH] use correct first/last symbols in vue pagination component --- .../javascripts/vue_shared/components/table_pagination.js | 4 ++-- changelogs/unreleased/29950-vue-pagination-icons.yml | 4 ++++ .../vue_shared/components/table_pagination_spec.js | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 changelogs/unreleased/29950-vue-pagination-icons.yml diff --git a/app/assets/javascripts/vue_shared/components/table_pagination.js b/app/assets/javascripts/vue_shared/components/table_pagination.js index b9cd28f6249..ebb14912b00 100644 --- a/app/assets/javascripts/vue_shared/components/table_pagination.js +++ b/app/assets/javascripts/vue_shared/components/table_pagination.js @@ -3,8 +3,8 @@ const UI_LIMIT = 6; const SPREAD = '...'; const PREV = 'Prev'; const NEXT = 'Next'; -const FIRST = '<< First'; -const LAST = 'Last >>'; +const FIRST = '« First'; +const LAST = 'Last »'; export default { props: { diff --git a/changelogs/unreleased/29950-vue-pagination-icons.yml b/changelogs/unreleased/29950-vue-pagination-icons.yml new file mode 100644 index 00000000000..e03092b8dba --- /dev/null +++ b/changelogs/unreleased/29950-vue-pagination-icons.yml @@ -0,0 +1,4 @@ +--- +title: consistent icons in vue and kaminari pagers +merge_request: +author: diff --git a/spec/javascripts/vue_shared/components/table_pagination_spec.js b/spec/javascripts/vue_shared/components/table_pagination_spec.js index a5c3870b3ac..d1640ffed99 100644 --- a/spec/javascripts/vue_shared/components/table_pagination_spec.js +++ b/spec/javascripts/vue_shared/components/table_pagination_spec.js @@ -83,7 +83,7 @@ describe('Pagination component', () => { }, }).$mount(); - component.changePage({ target: { innerText: 'Last >>' } }); + component.changePage({ target: { innerText: 'Last »' } }); expect(changeChanges.one).toEqual(10); }); @@ -100,7 +100,7 @@ describe('Pagination component', () => { }, }).$mount(); - component.changePage({ target: { innerText: '<< First' } }); + component.changePage({ target: { innerText: '« First' } }); expect(changeChanges.one).toEqual(1); }); -- GitLab