Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
54984485
Commit
54984485
authored
Jan 09, 2017
by
Regis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use Turbolinks instead of window.pushState for pagination
parent
76c68d1a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
10 deletions
+4
-10
app/assets/javascripts/vue_pagination/index.js.es6
app/assets/javascripts/vue_pagination/index.js.es6
+2
-5
app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
+2
-5
No files found.
app/assets/javascripts/vue_pagination/index.js.es6
View file @
54984485
...
@@ -17,15 +17,12 @@
...
@@ -17,15 +17,12 @@
/**
/**
This function will take the information given by the pagination component
This function will take the information given by the pagination component
And make a new
API call from the parent
And make a new
Turbolinks call
Here is an example `change` method:
Here is an example `change` method:
change(pagenum, apiScope) {
change(pagenum, apiScope) {
window.history.pushState({}, null, `?scope=${apiScope}&p=${pagenum}`);
Turbolinks.visit(`?scope=${apiScope}&p=${pagenum}`);
clearInterval(this.timeLoopInterval);
this.pageRequest = true;
this.store.fetchDataLoop.call(this, Vue, pagenum, this.scope, apiScope);
},
},
*/
*/
...
...
app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
View file @
54984485
/* global Vue, gl */
/* global Vue,
Turbolinks,
gl */
/* eslint-disable no-param-reassign */
/* eslint-disable no-param-reassign */
((gl) => {
((gl) => {
...
@@ -36,10 +36,7 @@
...
@@ -36,10 +36,7 @@
},
},
methods: {
methods: {
change(pagenum, apiScope) {
change(pagenum, apiScope) {
window.history.pushState({}, null, `?scope=${apiScope}&p=${pagenum}`);
Turbolinks.visit(`?scope=${apiScope}&p=${pagenum}`);
clearInterval(this.timeLoopInterval);
this.pageRequest = true;
this.store.fetchDataLoop.call(this, Vue, pagenum, this.scope, apiScope);
},
},
author(pipeline) {
author(pipeline) {
if (!pipeline.commit) return { avatar_url: '', web_url: '', username: '' };
if (!pipeline.commit) return { avatar_url: '', web_url: '', username: '' };
...
...
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