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

Show loading button while Ajax request is in progress.

Browse source
This commit is contained in:
Fatih Acet 2016-08-08 13:26:09 +03:00
parent b79378cae8
commit 41f7cee991
4 changed files with 35 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/merge_conflict_data_provider.js.es6
View file

@ -11,6 +11,7 @@ window.MergeConflictDataProvider = class MergeConflictDataProvider {
hasError : false,
isParallel : diffViewType === 'parallel',
diffViewType : diffViewType,
isSubmitting : false,
conflictsData : {},
resolutionData : {}
}
@ -18,7 +19,7 @@ window.MergeConflictDataProvider = class MergeConflictDataProvider {
decorateData(vueInstance, data) {
this.vueInstance = vueInstance;
this.vueInstance = vueInstance;
if (data.type === 'error') {
vueInstance.hasError = true;
@ -34,6 +35,7 @@ window.MergeConflictDataProvider = class MergeConflictDataProvider {
}
vueInstance.conflictsData = data;
vueInstance.isSubmitting = false;
}
@ -233,7 +235,7 @@ window.MergeConflictDataProvider = class MergeConflictDataProvider {
isAllResolved() {
return this.getConflictsCount() === this.getResolvedCount();
return !this.vueInstance.isSubmitting && this.getConflictsCount() === this.getResolvedCount();
}

33
app/assets/javascripts/merge_conflict_resolver.js.es6
View file

@ -31,6 +31,17 @@ window.MergeConflictResolver = class MergeConflictResolver {
}
setComputedProperties() {
const dp = this.dataProvider;
return {
conflictsCount() { return dp.getConflictsCount() },
resolvedCount() { return dp.getResolvedCount() },
allResolved() { return dp.isAllResolved() }
}
}
fetchData() {
const dp = this.dataProvider;
@ -47,21 +58,19 @@ window.MergeConflictResolver = class MergeConflictResolver {
}
setComputedProperties() {
const dp = this.dataProvider;
return {
conflictsCount() { return dp.getConflictsCount() },
resolvedCount() { return dp.getResolvedCount() },
allResolved() { return dp.isAllResolved() }
}
}
commit() {
this.vue.isSubmitting = true;
$.post('./resolve_conflicts', this.dataProvider.getCommitData())
.then( (data) => {
window.location.href = data.redirect_to
.done( (data) => {
window.location.href = data.redirect_to;
})
.error(() => {
new Flash('Something went wrong!');
})
.always(() => {
this.vue.isSubmitting = false;
});
}
}

4
app/assets/stylesheets/pages/merge_conflicts.scss
View file

@ -137,4 +137,8 @@ $unselected_line: #f8f8f8;
outline: none;
}
}
.btn-success .fa-spinner {
color: #FFF;
}
}

10
app/views/projects/merge_requests/conflicts.html.haml
View file

@ -126,8 +126,10 @@
%textarea.form-control.js-commit-message{":disabled" => "!allResolved", "v-model" => "conflictsData.commitMessage"}
{{{conflictsData.commitMessage}}}
%button{type: 'button', class: 'btn btn-success js-submit-button', ":disabled" => "!allResolved", "@click" => "commit()"}
Commit conflict resolution
%button{type: "button", class: "btn btn-success js-submit-button", ":disabled" => "!allResolved", "@click" => "commit()"}
%span Commit conflict resolution
%a.fa.fa-spin.fa-spinner{":class" => "{'hidden': !isSubmitting}"}
/ %button{type: 'button', class: 'btn btn-cancel'}
/ Cancel
/ FIXME: Hardcoded path
%a.btn.btn-cancel{"href" => "diffs"}
Cancel