Commit c9b36995 authored by Phil Hughes's avatar Phil Hughes

fixed loading icon hiding content

parent ce2bc5c0
<script> <script>
import { mapGetters, mapState } from 'vuex'; import { mapGetters } from 'vuex';
import Tabs from '../../../vue_shared/components/tabs/tabs'; import Tabs from '../../../vue_shared/components/tabs/tabs';
import Tab from '../../../vue_shared/components/tabs/tab.vue'; import Tab from '../../../vue_shared/components/tabs/tab.vue';
import List from './list.vue'; import List from './list.vue';
......
...@@ -80,55 +80,56 @@ export default { ...@@ -80,55 +80,56 @@ export default {
<template> <template>
<div> <div>
<loading-icon <div class="dropdown-input mt-3 pb-3 mb-0 border-bottom">
class="mt-3 mb-3" <input
v-if="isLoading" type="search"
size="2" class="dropdown-input-field"
/> placeholder="Search merge requests"
<template v-else> v-model="search"
<div class="dropdown-input mt-3 pb-3 mb-3 border-bottom"> @input="searchMergeRequests"
<input ref="searchInput"
type="search" />
class="dropdown-input-field" <i
placeholder="Search merge requests" aria-hidden="true"
v-model="search" class="fa fa-search dropdown-input-search"
@input="searchMergeRequests" ></i>
ref="searchInput" </div>
/> <div class="dropdown-content ide-merge-requests-dropdown-content d-flex">
<i <loading-icon
aria-hidden="true" class="mt-3 mb-3 align-self-center ml-auto mr-auto"
class="fa fa-search dropdown-input-search" v-if="isLoading"
></i> size="2"
</div> />
<div class="dropdown-content ide-merge-requests-dropdown-content"> <ul
<ul class="mb-3"> v-else
<template v-if="hasMergeRequests"> class="mb-3 w-100"
<li >
v-for="item in mergeRequests" <template v-if="hasMergeRequests">
:key="item.id"
>
<item
:item="item"
:current-id="currentMergeRequestId"
:current-project-id="currentProjectId"
@click="viewMergeRequest"
/>
</li>
</template>
<li <li
v-else v-for="item in mergeRequests"
class="ide-merge-requests-empty d-flex align-items-center justify-content-center" :key="item.id"
> >
<template v-if="hasNoSearchResults"> <item
{{ __('No merge requests found') }} :item="item"
</template> :current-id="currentMergeRequestId"
<template v-else> :current-project-id="currentProjectId"
{{ emptyText }} @click="viewMergeRequest"
</template> />
</li> </li>
</ul> </template>
</div> <li
</template> v-else
class="ide-merge-requests-empty d-flex align-items-center justify-content-center"
>
<template v-if="hasNoSearchResults">
{{ __('No merge requests found') }}
</template>
<template v-else>
{{ emptyText }}
</template>
</li>
</ul>
</div>
</div> </div>
</template> </template>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment