BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
696864ea
Commit
696864ea
authored
Dec 15, 2016
by
Regis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove need for complex regex in pagination - add else if
parent
be3e32f5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
6 deletions
+13
-6
index.js.es6
app/assets/javascripts/vue_pagination/index.js.es6
+13
-6
No files found.
app/assets/javascripts/vue_pagination/index.js.es6
View file @
696864ea
...
...
@@ -26,16 +26,23 @@
const text = e.target.innerText;
const { totalPages, nextPage, previousPage } = this.pageInfo;
if (text === SPREAD) return;
/**
the regex here is to read if the string coming in will become a valid number
had issues with parsing using `+` because `typeof NaN === 'number'`
*/
if (/^-?[\d.]+(?:e-?\d+)?$/.test(text)) pagenum = +text;
if (text === LAST) pagenum = totalPages;
if (text === NEXT) pagenum = nextPage;
if (text === PREV) pagenum = previousPage;
if (text === FIRST) pagenum = 1;
if (text === SPREAD) {
return;
} else if (text === LAST) {
pagenum = totalPages;
} else if (text === NEXT) {
pagenum = nextPage;
} else if (text === PREV) {
pagenum = previousPage;
} else if (text === FIRST) {
pagenum = 1;
} else {
pagenum = +text;
}
this.change(pagenum, apiScope);
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment