Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts/projects/compare/components/revision_dropdown.vue')
-rw-r--r--app/assets/javascripts/projects/compare/components/revision_dropdown.vue15
1 files changed, 11 insertions, 4 deletions
diff --git a/app/assets/javascripts/projects/compare/components/revision_dropdown.vue b/app/assets/javascripts/projects/compare/components/revision_dropdown.vue
index d0b69344c12..f0b8e73e528 100644
--- a/app/assets/javascripts/projects/compare/components/revision_dropdown.vue
+++ b/app/assets/javascripts/projects/compare/components/revision_dropdown.vue
@@ -56,6 +56,9 @@ export default {
searchTerm: debounce(function debounceSearch() {
this.searchBranchesAndTags();
}, SEARCH_DEBOUNCE_MS),
+ paramsBranch(newBranch) {
+ this.setSelectedRevision(newBranch);
+ },
},
mounted() {
this.fetchBranchesAndTags();
@@ -84,7 +87,7 @@ export default {
this.loading = true;
if (reset) {
- this.selectedRevision = this.getDefaultBranch();
+ this.setSelectedRevision(this.paramsBranch);
}
return axios
@@ -108,10 +111,14 @@ export default {
return this.paramsBranch || EMPTY_DROPDOWN_TEXT;
},
onClick(revision) {
- this.selectedRevision = revision;
+ this.setSelectedRevision(revision);
+ this.$emit('selectRevision', { direction: this.paramsName, revision });
},
onSearchEnter() {
- this.selectedRevision = this.searchTerm;
+ this.setSelectedRevision(this.searchTerm);
+ },
+ setSelectedRevision(revision) {
+ this.selectedRevision = revision || EMPTY_DROPDOWN_TEXT;
},
},
};
@@ -122,7 +129,7 @@ export default {
<input type="hidden" :name="paramsName" :value="selectedRevision" />
<gl-dropdown
class="gl-w-full gl-font-monospace"
- toggle-class="form-control compare-dropdown-toggle js-compare-dropdown gl-min-w-0"
+ toggle-class="form-control compare-dropdown-toggle gl-min-w-0"
:text="selectedRevision"
:header-text="s__('CompareRevisions|Select Git revision')"
:loading="loading"