Skip to content

Commit 3a49400

Browse files
Pytalnextcloud-command
authored andcommitted
Port global search menu to focus trapped NcHeaderMenu
Signed-off-by: Christopher Ng <[email protected]> Signed-off-by: nextcloud-command <[email protected]>
1 parent 1c51721 commit 3a49400

File tree

7 files changed

+22
-260
lines changed

7 files changed

+22
-260
lines changed

core/src/components/HeaderMenu.vue

Lines changed: 0 additions & 238 deletions
This file was deleted.

core/src/views/UnifiedSearch.vue

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
-
2121
-->
2222
<template>
23-
<HeaderMenu id="unified-search"
23+
<NcHeaderMenu id="unified-search"
2424
class="unified-search"
2525
exclude-click-outside-classes="popover"
2626
:open.sync="open"
@@ -150,24 +150,26 @@
150150
</li>
151151
</ul>
152152
</template>
153-
</HeaderMenu>
153+
</NcHeaderMenu>
154154
</template>
155155

156156
<script>
157+
import debounce from 'debounce'
157158
import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
158-
import { minSearchLength, getTypes, search, defaultLimit, regexFilterIn, regexFilterNot, enableLiveSearch } from '../services/UnifiedSearchService'
159159
import { showError } from '@nextcloud/dialogs'
160160
161-
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
162-
import NcActions from '@nextcloud/vue/dist/Components/NcActions'
163-
import debounce from 'debounce'
164-
import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent'
165-
import NcHighlight from '@nextcloud/vue/dist/Components/NcHighlight'
166-
import Magnify from 'vue-material-design-icons/Magnify'
161+
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
162+
import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
163+
import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
164+
import NcHeaderMenu from '@nextcloud/vue/dist/Components/NcHeaderMenu.js'
165+
import NcHighlight from '@nextcloud/vue/dist/Components/NcHighlight.js'
166+
167+
import Magnify from 'vue-material-design-icons/Magnify.vue'
167168
168-
import HeaderMenu from '../components/HeaderMenu'
169-
import SearchResult from '../components/UnifiedSearch/SearchResult'
170-
import SearchResultPlaceholders from '../components/UnifiedSearch/SearchResultPlaceholders'
169+
import SearchResult from '../components/UnifiedSearch/SearchResult.vue'
170+
import SearchResultPlaceholders from '../components/UnifiedSearch/SearchResultPlaceholders.vue'
171+
172+
import { minSearchLength, getTypes, search, defaultLimit, regexFilterIn, regexFilterNot, enableLiveSearch } from '../services/UnifiedSearchService.js'
171173
172174
const REQUEST_FAILED = 0
173175
const REQUEST_OK = 1
@@ -177,12 +179,12 @@ export default {
177179
name: 'UnifiedSearch',
178180
179181
components: {
182+
Magnify,
180183
NcActionButton,
181184
NcActions,
182185
NcEmptyContent,
183-
HeaderMenu,
186+
NcHeaderMenu,
184187
NcHighlight,
185-
Magnify,
186188
SearchResult,
187189
SearchResultPlaceholders,
188190
},

dist/core-common.js

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

dist/core-common.js.LICENSE.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,8 +382,6 @@
382382

383383
/*! For license information please see Tooltip.js.LICENSE.txt */
384384

385-
/*! For license information please see excludeClickOutsideClasses.js.LICENSE.txt */
386-
387385
/*! For license information please see index.module.js.LICENSE.txt */
388386

389387
/*! For license information please see ncvuecomponents.js.LICENSE.txt */

dist/core-common.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/core-unified-search.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/core-unified-search.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)