Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
be146a4f
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
be146a4f
编写于
11月 06, 2016
作者:
R
Regis
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove svg api call - more progress on pagination
上级
fd10ff30
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
35 addition
and
25 deletion
+35
-25
app/assets/javascripts/vue_pagination/index.js.es6
app/assets/javascripts/vue_pagination/index.js.es6
+32
-13
app/assets/javascripts/vue_pipelines_index/index.js.es6
app/assets/javascripts/vue_pipelines_index/index.js.es6
+1
-1
app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
+2
-2
app/assets/javascripts/vue_pipelines_index/store.js.es6
app/assets/javascripts/vue_pipelines_index/store.js.es6
+0
-9
未找到文件。
app/assets/javascripts/vue_pagination/index.js.es6
浏览文件 @
be146a4f
...
...
@@ -3,14 +3,19 @@
((gl) => {
gl.VueGlPagination = Vue.extend({
data() {
return {
nslice: +this.pagenum,
};
},
props: [
'changepage',
'pages',
'count',
'pagenum',
],
methods: {
pagenumberstatus(n) {
console.log(n, this.nslice);
if (n - 1 === +this.pagenum) return 'active';
return '';
},
...
...
@@ -20,35 +25,46 @@
},
},
computed: {
paginationsection() {
if (this.last < 6 && this.pagenum < 6) {
const pageArray = [...Array(6).keys()];
pageArray.shift();
return pageArray.slice(0, this.upcount);
}
const section = [...Array(this.upcount).keys()];
section.shift();
this.nslice = +this.pagenum;
return section.slice(+this.pagenum, +this.pagenum + 5);
},
last() {
return Math.ceil(+this.count / 5);
},
lastpage() {
return `pipelines?p=${this.last}`;
},
upcount() {
return +this.last + 1;
},
prev() {
if (this.pagenum === 1) return 1;
return this.pagenum - 1;
endspread() {
if (+this.pagenum < this.last && +this.pagenum > 5) return true;
return false
},
begspread() {
if (+this.pagenum > 5 && +this.pagenum < this.last) return true;
return false
},
},
template: `
<div class="gl-pagination">
<ul class="pagination clearfix" v-for='n in
upcount
'>
<li :class='prevstatus(n)' v-if='n === 1'>
<ul class="pagination clearfix" v-for='n in
paginationsection
'>
<li :class='prevstatus(n)' v-if='n === 1
|| n - 1 === nslice
'>
<span @click='changepage($event, {where: pagenum - 1})'>Prev</span>
</li>
<li :class='pagenumberstatus(n)' v-
else
>
<li :class='pagenumberstatus(n)' v-
if='n >= 2'
>
<span @click='changepage($event)'>{{(n - 1)}}</span>
</li>
<!--
take a slice of current array (up to 5)
if at end make dots dissapear
if in second slice or more make dots appear in the front
-->
<li v-if='n === upcount && upcount > 4'>
<li v-if='n === upcount && upcount > 4
&& begspread
'>
<span class="gap">…</span>
</li>
<li class="next" v-if='n === upcount && pagenum !== last'>
...
...
@@ -56,8 +72,11 @@
Next
</span>
</li>
<li v-if='n === upcount && upcount > 4 && endspread'>
<span class="gap">…</span>
</li>
<li class="last" v-if='n === upcount && pagenum !== last'>
<span @click='changepage($event, {
last
: last})'>Last »</span>
<span @click='changepage($event, {
where
: last})'>Last »</span>
</li>
</ul>
</div>
...
...
app/assets/javascripts/vue_pipelines_index/index.js.es6
浏览文件 @
be146a4f
...
...
@@ -34,7 +34,7 @@
<vue-pipelines
:scope='scope'
:store='store'
:count='
count
'
:count='
90
'
>
</vue-pipelines>
</div>
...
...
app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
浏览文件 @
be146a4f
...
...
@@ -37,8 +37,8 @@
},
changepage(event, page = {}) {
if (page) this.pagenum = +event.target.innerText;
if (page.
last) this.pagenum = +page.last
;
if (page.where) this.pagenum = +page.
next
;
if (page.
where) this.pagenum = +page.where
;
if (page.where) this.pagenum = +page.
where
;
// use p instead of page to avoid making an actual request
window.history.pushState({}, null, `?p=${this.pagenum}`);
...
...
app/assets/javascripts/vue_pipelines_index/store.js.es6
浏览文件 @
be146a4f
...
...
@@ -23,14 +23,5 @@
goFetch();
}, 60000);
}
fetchSvg(type, icon) {
this.$http.get(`/shared/icons/${icon}`)
.then((response) => {
this[type] = JSON.parse(response.body);
}, () => new Flash(
'Something went wrong on our end.'
));
}
};
})(window.gl || (window.gl = {}));
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录