Skip to content

[stable25] fix(search): fix load more #38325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
szaimen merged 2 commits into from
May 16, 2023
Merged

[stable25] fix(search): fix load more #38325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
075bb5f
fix(search): fix load more
skjnldsv May 16, 2023
b4d7f56
fix backport
szaimen May 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/files/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,9 +371,9 @@
this.navigation.setActiveItem(params.view, {silent: true});
if (lastId !== this.navigation.getActiveItem()) {
this.navigation.getActiveContainer().trigger(new $.Event('show'));
window._nc_event_bus.emit('files:navigation:changed')
}
this.navigation.getActiveContainer().trigger(new $.Event('urlChanged', params));
window._nc_event_bus.emit('files:navigation:changed')
},

/**
Expand Down
8 changes: 4 additions & 4 deletions core/src/views/UnifiedSearch.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
? t('core', 'Loading more results …')
: t('core', 'Load more results')"
:icon-class="loading[type] ? 'icon-loading-small' : ''"
@click.stop="loadMore(type)"
@click.prevent.stop="loadMore(type)"
@focus="setFocusedIndex" />
</li>
</ul>
Expand Down Expand Up @@ -335,13 +335,13 @@ export default {
},

async created() {
subscribe('files:navigation:changed', this.resetForm)
subscribe('files:navigation:changed', this.onNavigationChange)
this.types = await getTypes()
this.logger.debug('Unified Search initialized with the following providers', this.types)
},

beforeDestroy() {
unsubscribe('files:navigation:changed', this.resetForm)
unsubscribe('files:navigation:changed', this.onNavigationChange)
},

mounted() {
Expand Down Expand Up @@ -380,7 +380,7 @@ export default {
emit('nextcloud:unified-search.close')
},

resetForm() {
onNavigationChange() {
this.$el.querySelector('form[role="search"]').reset()
},

Expand Down
4 changes: 2 additions & 2 deletions dist/core-unified-search.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-unified-search.js.map
View file
Open in desktop

Large diffs are not rendered by default.