diff options
author | Fatih Acet <acetfatih@gmail.com> | 2017-01-20 21:22:35 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2017-01-20 21:22:35 +0000 |
commit | b16dad7b1d8b45fdd1162048ea7aa00bbc47b713 (patch) | |
tree | f81ede0fd7d3d66d9ea70a444497462d125599ab /app | |
parent | a91ff32b7699039c94ec095ddd658a9edcf38cd4 (diff) | |
parent | df3db8e859ee87abf9776c8799837536530eeb23 (diff) | |
download | gitlab-ce-b16dad7b1d8b45fdd1162048ea7aa00bbc47b713.tar.gz |
Merge branch 'keep_mini_graph_down_pipelines_index' into 'master'
Keep mini graph down pipelines index
See merge request !8651
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/vue_pipelines_index/stage.js.es6 | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/app/assets/javascripts/vue_pipelines_index/stage.js.es6 b/app/assets/javascripts/vue_pipelines_index/stage.js.es6 index 32973132174..4e85f16ebc5 100644 --- a/app/assets/javascripts/vue_pipelines_index/stage.js.es6 +++ b/app/assets/javascripts/vue_pipelines_index/stage.js.es6 @@ -1,5 +1,5 @@ /* global Vue, Flash, gl */ -/* eslint-disable no-param-reassign, no-bitwise */ +/* eslint-disable no-param-reassign */ ((gl) => { gl.VueStage = Vue.extend({ @@ -9,7 +9,20 @@ spinner: '<span class="fa fa-spinner fa-spin"></span>', }; }, - props: ['stage', 'svgs', 'match'], + props: { + stage: { + type: Object, + required: true, + }, + svgs: { + type: DOMStringMap, + required: true, + }, + match: { + type: Function, + required: true, + }, + }, methods: { fetchBuilds(e) { const areaExpanded = e.currentTarget.attributes['aria-expanded']; @@ -24,6 +37,18 @@ return flash; }); }, + keepGraph(e) { + const { target } = e; + + if (target.className.indexOf('js-ci-action-icon') >= 0) return null; + + if ( + target.parentElement && + (target.parentElement.className.indexOf('js-ci-action-icon') >= 0) + ) return null; + + return e.stopPropagation(); + }, }, computed: { buildsOrSpinner() { @@ -64,7 +89,7 @@ <ul class="dropdown-menu mini-pipeline-graph-dropdown-menu js-builds-dropdown-container"> <div class="arrow-up"></div> <div - @click='' + @click='keepGraph($event)' :class="dropdownClass" class="js-builds-dropdown-list scrollable-menu" v-html="buildsOrSpinner" |