kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

fix cancel url - clearInterval on refresh and page close - fix branch url

This commit is contained in:
Regis 2016-11-12 01:57:23 -07:00
parent 35c8e533c0
commit 04a4520c2d
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/vue_pipelines_index/branch_commit.js.es6
View File

@ -20,7 +20,7 @@
<!-- ** will need branch_url for this branch ** -->
<a
class="monospace branch-name"
:href='pipeline.commit.commit_url'
:href='pipeline.ref.url'
>
{{pipeline.ref.name}}
</a>

4
app/assets/javascripts/vue_pipelines_index/pipeline_actions.js.es6
View File

@ -80,7 +80,7 @@
<div class="cancel-retry-btns inline">
<!-- @click='retry($event)' -->
<a
v-if='!pipeline.cancel_url'
v-if='!pipeline.cancel_url || pipeline.details.status !== "cancelled"'
class="btn has-tooltip"
title="Retry"
rel="nofollow"
@ -95,7 +95,7 @@
title=""
rel="nofollow"
data-method="post"
href="/gitlab-org/gitlab-ce/pipelines/4950216/cancel"
:href='pipeline.cancel_url'
data-original-title="Cancel"
>
<i class="fa fa-remove"></i>

4
app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
View File

@ -37,8 +37,8 @@
this.store.fetchDataLoop.call(this, Vue, this.pagenum, this.scope);
},
methods: {
changepage(event, last) {
const text = event.target.innerText;
changepage(e, last) {
const text = e.target.innerText;
if (text === '...') return;
if (/^-?[\d.]+(?:e-?\d+)?$/.test(text)) this.pagenum = +text;
if (text === 'Last >>') this.pagenum = last;

6
app/assets/javascripts/vue_pipelines_index/store.js.es6
View File

@ -53,8 +53,12 @@
goFetch();
this.intervalId = setInterval(() => {
goUpdate();
if (this.updatedAt) goUpdate();
}, 3000);
window.onbeforeunload = function removePipelineInterval() {
clearInterval(this.intervalId);
};
}
};
})(window.gl || (window.gl = {}));