Alamantus
/
Readlebee
mirror of https://gitlab.com/Alamantus/Readlebee.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix search not working on fresh load

This commit is contained in:
Robbie Antenesse 2019-09-26 12:56:28 -06:00
parent 40084c4072
commit 1062b9b2fd
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/appListeners.js
View File

@ -16,5 +16,7 @@ export const appListeners = (app, state, emitter) => {
state.language = newLanguage; state.language = newLanguage;
emitter.emit('render', () => { }); emitter.emit('render', () => { });
}); });
emitter.emit('render'); // This should hopefully only run once after the DOM is loaded. It prevents routing issues where 'render' hasn't been defined yet
}); });
} }

8
app/views/search/controller.js
View File

@ -6,6 +6,8 @@ export class SearchController extends ViewController {
// which stores state in this.appState and the view controller's state to this.state // which stores state in this.appState and the view controller's state to this.state
super(state, i18n, 'search', { super(state, i18n, 'search', {
lastSearch: '', lastSearch: '',
lastSource: 'inventaire',
lastBy: 'title',
searchSource: 'inventaire', searchSource: 'inventaire',
searchBy: 'title', searchBy: 'title',
done: true, done: true,
@ -33,7 +35,9 @@ export class SearchController extends ViewController {
} }
get queryIsNew() { get queryIsNew() {
return this.state.lastSearch !== this.appState.query.for.trim(); return this.state.lastSearch !== this.appState.query.for.trim()
|| this.state.lastSource !== this.state.searchSource
|| this.state.lastBy !== this.state.searchBy;
} }
get openModal() { get openModal() {
@ -49,6 +53,8 @@ export class SearchController extends ViewController {
this.state.done = false; this.state.done = false;
this.emit('render', () => { this.emit('render', () => {
this.state.lastSearch = this.appState.query.for; this.state.lastSearch = this.appState.query.for;
this.state.lastSource = this.state.searchSource;
this.state.lastBy = this.state.searchBy;
const searchTerm = this.appState.query.for.trim(); const searchTerm = this.appState.query.for.trim();