mirror of https://github.com/nextcloud/server
Merge pull request #34100 from nextcloud/fix/reset-global-search
Reset global search on files sidebar navigation change
This commit is contained in:
commit
8b6f5a41c8
|
@ -323,6 +323,7 @@
|
|||
this._changeUrl(params.view, params.dir);
|
||||
OC.Apps.hideAppSidebar($('.detailsView'));
|
||||
this.navigation.getActiveContainer().trigger(new $.Event('urlChanged', params));
|
||||
window._nc_event_bus.emit('files:navigation:changed')
|
||||
}
|
||||
},
|
||||
|
||||
|
@ -374,6 +375,7 @@
|
|||
this.navigation.getActiveContainer().trigger(new $.Event('show'));
|
||||
}
|
||||
this.navigation.getActiveContainer().trigger(new $.Event('urlChanged', params));
|
||||
window._nc_event_bus.emit('files:navigation:changed')
|
||||
},
|
||||
|
||||
/**
|
||||
|
|
|
@ -150,7 +150,7 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import { emit } from '@nextcloud/event-bus'
|
||||
import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
|
||||
import { minSearchLength, getTypes, search, defaultLimit, regexFilterIn, regexFilterNot, enableLiveSearch } from '../services/UnifiedSearchService'
|
||||
import { showError } from '@nextcloud/dialogs'
|
||||
|
||||
|
@ -329,10 +329,15 @@ export default {
|
|||
},
|
||||
|
||||
async created() {
|
||||
subscribe('files:navigation:changed', this.resetForm)
|
||||
this.types = await getTypes()
|
||||
this.logger.debug('Unified Search initialized with the following providers', this.types)
|
||||
},
|
||||
|
||||
beforeDestroy() {
|
||||
unsubscribe('files:navigation:changed', this.resetForm)
|
||||
},
|
||||
|
||||
mounted() {
|
||||
if (OCP.Accessibility.disableKeyboardShortcuts()) {
|
||||
return
|
||||
|
@ -371,6 +376,10 @@ export default {
|
|||
emit('nextcloud:unified-search.close')
|
||||
},
|
||||
|
||||
resetForm() {
|
||||
this.$el.querySelector('form[role="search"]').reset()
|
||||
},
|
||||
|
||||
/**
|
||||
* Reset the search state
|
||||
*/
|
||||
|
|
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue