diff options
| author | Himanshu Kapoor <hkapoor@gitlab.com> | 2019-08-09 12:31:54 +0530 |
|---|---|---|
| committer | Himanshu Kapoor <hkapoor@gitlab.com> | 2019-08-09 12:44:42 +0530 |
| commit | 8470c131fa1eaacdf5a2278b69e79939fe761dcc (patch) | |
| tree | 4b22db76d754864952a6d69e4a5614efb947a9c0 /app/assets/javascripts/ide/components/merge_requests/list.vue | |
| parent | f6a201a8389895b1f3dbc510f82372cce72c4611 (diff) | |
| download | gitlab-ce-8470c131fa1eaacdf5a2278b69e79939fe761dcc.tar.gz | |
Focus on the input when clicked outside the input
Fixed in MR list and branch list components.
Earlier clicking right outside the input box closed
the dropdown, which was unexpected behaviour. To
make it consistent with the behaviour of select2
jquery plugin, I have made clicking outside the
input focus on the input by using a label.
Diffstat (limited to 'app/assets/javascripts/ide/components/merge_requests/list.vue')
| -rw-r--r-- | app/assets/javascripts/ide/components/merge_requests/list.vue | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/app/assets/javascripts/ide/components/merge_requests/list.vue b/app/assets/javascripts/ide/components/merge_requests/list.vue index 2d55ffb3c65..6b9c83bad6c 100644 --- a/app/assets/javascripts/ide/components/merge_requests/list.vue +++ b/app/assets/javascripts/ide/components/merge_requests/list.vue @@ -76,19 +76,17 @@ export default { <template> <div> - <div class="dropdown-input mt-3 pb-3 mb-0 border-bottom"> - <div class="position-relative"> - <tokened-input - v-model="search" - :tokens="searchTokens" - :placeholder="__('Search merge requests')" - @focus="onSearchFocus" - @input="searchMergeRequests" - @removeToken="setSearchType(null)" - /> - <icon :size="18" name="search" class="input-icon" /> - </div> - </div> + <label class="dropdown-input pt-3 pb-3 mb-0 border-bottom block" @click.stop> + <tokened-input + v-model="search" + :tokens="searchTokens" + :placeholder="__('Search merge requests')" + @focus="onSearchFocus" + @input="searchMergeRequests" + @removeToken="setSearchType(null)" + /> + <icon :size="18" name="search" class="input-icon" /> + </label> <div class="dropdown-content ide-merge-requests-dropdown-content d-flex"> <gl-loading-icon v-if="isLoading" @@ -107,7 +105,7 @@ export default { <span class="d-flex append-right-default ide-search-list-current-icon"> <icon :size="18" name="search" /> </span> - <span> {{ searchType.label }} </span> + <span>{{ searchType.label }}</span> </button> </li> </template> |