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
Tatuya Kamada
gitlab-ce
Commits
e99f4534
Commit
e99f4534
authored
Jan 15, 2017
by
Regis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
phil said this is good - no need to dynamically update since this is a static page for now
parent
f9f27432
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
49 deletions
+7
-49
app/assets/javascripts/vue_pipelines_index/stage.js.es6
app/assets/javascripts/vue_pipelines_index/stage.js.es6
+7
-49
No files found.
app/assets/javascripts/vue_pipelines_index/stage.js.es6
View file @
e99f4534
...
@@ -5,72 +5,31 @@
...
@@ -5,72 +5,31 @@
gl.VueStage = Vue.extend({
gl.VueStage = Vue.extend({
data() {
data() {
return {
return {
request: false
,
count: 0
,
builds: '',
builds: '',
spinner: '<span class="fa fa-spinner fa-spin"></span>',
spinner: '<span class="fa fa-spinner fa-spin"></span>',
};
};
},
},
props: ['stage', 'svgs', 'match'],
props: ['stage', 'svgs', 'match'],
methods: {
methods: {
fetchBuilds(e) {
fetchBuilds() {
/**
if (this.count > 0) return null;
This is a very interesting UI problem
Essentially we have to clear builds on blur no matter what
This was preventing turbolinks to make the request to the link clicked
Vue will always look at the VDOM element which is the button
It has a special attribute 'aria-expanded':
- which will let us know if it is expanded
- once the build link is clicked
- when someone clicks outside of the dropdown
In order for this to work:
- we check that the event has the correct aria attribute
- we make sure that if it does, we check where the event is on the DOM
- we also check to see if the event is on the DOM or the native browser client
*/
const areaExpanded = e.currentTarget.attributes['aria-expanded'];
if (areaExpanded && (areaExpanded.textContent === 'true')) {
const related = e.relatedTarget;
if (!related && e.sourceCapabilities) {
return this.clearBuilds();
} else if (!related && e.sourceCapabilities === null) {
return null;
} else if (!related && e.sourceCapabilities === undefined) {
this.request = false;
return null;
} else if (!related.parentElement) {
return this.clearBuilds();
} else if (~related.parentElement.parentElement.className.indexOf('js-builds-dropdown-container')) {
return null;
}
}
if (this.request) return this.clearBuilds();
return this.$http.get(this.stage.dropdown_path)
return this.$http.get(this.stage.dropdown_path)
.then((response) => {
.then((response) => {
this.
request = true
;
this.
count += 1
;
this.builds = JSON.parse(response.body).html;
this.builds = JSON.parse(response.body).html;
}, () => {
}, () => {
const flash = new Flash('Something went wrong on our end.');
const flash = new Flash('Something went wrong on our end.');
this.request = false;
return flash;
return flash;
});
});
},
},
clearBuilds() {
this.builds = '';
this.request = false;
},
},
},
computed: {
computed: {
buildsOrSpinner() {
buildsOrSpinner() {
return this.
request
? this.builds : this.spinner;
return this.
builds
? this.builds : this.spinner;
},
},
dropdownClass() {
dropdownClass() {
if (this.
request
) return 'js-builds-dropdown-container';
if (this.
builds
) return 'js-builds-dropdown-container';
return 'js-builds-dropdown-loading builds-dropdown-loading';
return 'js-builds-dropdown-loading builds-dropdown-loading';
},
},
buildStatus() {
buildStatus() {
...
@@ -91,8 +50,7 @@
...
@@ -91,8 +50,7 @@
template: `
template: `
<div>
<div>
<button
<button
@click='fetchBuilds($event)'
@click='fetchBuilds'
@blur='fetchBuilds($event)'
:class="triggerButtonClass"
:class="triggerButtonClass"
:title='stage.title'
:title='stage.title'
data-placement="top"
data-placement="top"
...
...
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