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
Boxiang Sun
gitlab-ce
Commits
0c15bbad
Commit
0c15bbad
authored
Nov 03, 2016
by
Regis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
last logic no href anymore
parent
64e8ab95
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
10 deletions
+8
-10
app/assets/javascripts/vue_pipelines_index/pipelines.vue.js.es6
...sets/javascripts/vue_pipelines_index/pipelines.vue.js.es6
+3
-2
app/assets/javascripts/vue_pipelines_index/vue_gl_pagination.vue.js.es6
...ascripts/vue_pipelines_index/vue_gl_pagination.vue.js.es6
+5
-8
No files found.
app/assets/javascripts/vue_pipelines_index/pipelines.vue.js.es6
View file @
0c15bbad
...
...
@@ -34,8 +34,9 @@
shortsha(pipeline) {
return pipeline.sha.slice(0, 8);
},
changepage(event) {
this.pagenum = +event.target.innerText;
changepage(event, last) {
if (last) this.pagenum = +last;
if (!last) this.pagenum = +event.target.innerText;
// use p instead of page to avoid rails tyring to make an actual request
window.history.pushState({}, null, `?p=${this.pagenum}`);
clearInterval(this.intervalId);
...
...
app/assets/javascripts/vue_pipelines_index/vue_gl_pagination.vue.js.es6
View file @
0c15bbad
...
...
@@ -48,17 +48,14 @@
<li :class='pagenumberstatus(n)' v-else>
<a @click='changepage($event)'>{{(n - 1)}}</a>
</li>
<!--
still working on this bit
<li class="page" v-if='n === upcount - 1'>
<span class="page gap">…</span>
</li>
-->
<li class="page" v-if='n === upcount'>
<span class="page gap">…</span>
</li>
<li class="next" v-if='n === upcount'>
<a rel="next" :href='next'>Next</a>
</li>
<li class="last" v-if='n === upcount'>
<a
:href='lastpage
'>Last »</a>
<li class="last" v-if='n === upcount
&& pagenum !== last
'>
<a
@click='changepage($event, last)
'>Last »</a>
</li>
</ul>
</div>
...
...
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