Use Choo's state.events as constants for event names

This commit is contained in:
Robbie Antenesse 2020-09-16 14:16:50 -06:00
parent a5c0a7efe4
commit a3a8914413
7 changed files with 25 additions and 23 deletions

View File

@ -1,9 +1,9 @@
export const appListeners = (app, state, emitter) => { export const appListeners = (app, state, emitter) => {
emitter.on('DOMContentLoaded', () => { emitter.on(state.events.DOMCONTENTLOADED, () => {
emitter.emit('DOMTitleChange', app.siteConfig.siteName); emitter.emit(state.events.DOMTITLECHANGE, app.siteConfig.siteName);
// Emitter listeners // Emitter listeners
emitter.on('render', callback => { emitter.on(state.events.RENDER, callback => {
// This is a dirty hack to get the callback to call *after* re-rendering. // This is a dirty hack to get the callback to call *after* re-rendering.
if (callback && typeof callback === "function") { if (callback && typeof callback === "function") {
setTimeout(() => { setTimeout(() => {
@ -12,17 +12,17 @@ export const appListeners = (app, state, emitter) => {
} }
}); });
emitter.on('set-language', newLanguage => { emitter.on(state.events.SET_LANGUAGE, newLanguage => {
app.setSettingsItem('lang', newLanguage); app.setSettingsItem('lang', newLanguage);
state.language = newLanguage; state.language = newLanguage;
state.i18n.fetchLocaleUI().then(() => { state.i18n.fetchLocaleUI().then(() => {
emitter.emit('render'); emitter.emit(state.events.RENDER);
}); });
}); });
state.i18n.fetchLocaleUI().then(() => { state.i18n.fetchLocaleUI().then(() => {
app.checkIfLoggedIn(state).then(isLoggedIn => { app.checkIfLoggedIn(state).then(isLoggedIn => {
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 emitter.emit(state.events.RENDER); // This should hopefully only run once after the DOM is loaded. It prevents routing issues where 'render' hasn't been defined yet
}); });
}) })
}); });

View File

@ -1,6 +1,8 @@
import { I18n } from "./i18n"; import { I18n } from "./i18n";
export const appState = (app, state, emitter) => { export const appState = (app, state, emitter) => {
state.events.SET_LANGUAGE = 'set-language';
state.language = app.getSettingsItem('lang') ? app.getSettingsItem('lang') : (navigator.language || navigator.userLanguage).split('-')[0]; state.language = app.getSettingsItem('lang') ? app.getSettingsItem('lang') : (navigator.language || navigator.userLanguage).split('-')[0];
state.viewStates = {}; state.viewStates = {};
state.isLoggedIn = false; state.isLoggedIn = false;

View File

@ -13,7 +13,7 @@ export const aboutView = (state, emit, i18n) => {
community.innerHTML = i18n.pages.community; community.innerHTML = i18n.pages.community;
} }
if (promises.length > 0) { if (promises.length > 0) {
Promise.all(promises).then(fulfilled => emit('render')); Promise.all(promises).then(fulfilled => emit(state.events.RENDER));
} }
return [ return [
content, content,

View File

@ -34,7 +34,7 @@ export class LoginController extends ViewController {
this.state.fieldValues.loginEmail = ''; this.state.fieldValues.loginEmail = '';
this.state.fieldValues.loginPassword = ''; this.state.fieldValues.loginPassword = '';
this.emit('render'); this.emit(this.appState.events.RENDER);
} }
clearCreateAccountForm () { clearCreateAccountForm () {
@ -44,7 +44,7 @@ export class LoginController extends ViewController {
this.state.fieldValues.createPassword = ''; this.state.fieldValues.createPassword = '';
this.state.fieldValues.createConfirm = ''; this.state.fieldValues.createConfirm = '';
this.emit('render'); this.emit(this.appState.events.RENDER);
} }
validateLogin () { validateLogin () {
@ -52,7 +52,7 @@ export class LoginController extends ViewController {
this.state.loginError = ''; this.state.loginError = '';
this.state.isChecking = true; this.state.isChecking = true;
this.emit('render', () => { this.emit(this.appState.events.RENDER, () => {
const { const {
loginEmail, loginEmail,
loginPassword loginPassword
@ -64,7 +64,7 @@ export class LoginController extends ViewController {
].includes('')) { ].includes('')) {
this.state.loginError = __('login.login_required_field_blank'); this.state.loginError = __('login.login_required_field_blank');
this.state.isChecking = false; this.state.isChecking = false;
this.emit('render'); this.emit(this.appState.events.RENDER);
return; return;
} }
@ -77,7 +77,7 @@ export class LoginController extends ViewController {
this.state.createError = ''; this.state.createError = '';
this.state.isChecking = true; this.state.isChecking = true;
this.emit('render', () => { this.emit(this.appState.events.RENDER, () => {
const { const {
createEmail, createEmail,
createUsername, createUsername,
@ -93,14 +93,14 @@ export class LoginController extends ViewController {
].includes('')) { ].includes('')) {
this.state.createError = __('login.create_required_field_blank'); this.state.createError = __('login.create_required_field_blank');
this.state.isChecking = false; this.state.isChecking = false;
this.emit('render'); this.emit(this.appState.events.RENDER);
return; return;
} }
if (createPassword !== createConfirm) { if (createPassword !== createConfirm) {
this.state.createError = __('login.create_password_confirm_mismatch'); this.state.createError = __('login.create_password_confirm_mismatch');
this.state.isChecking = false; this.state.isChecking = false;
this.emit('render'); this.emit(this.appState.events.RENDER);
return; return;
} }
@ -130,7 +130,7 @@ export class LoginController extends ViewController {
console.error(response); console.error(response);
this.state.loginError = __(response.message); this.state.loginError = __(response.message);
this.state.isChecking = false; this.state.isChecking = false;
this.emit('render'); this.emit(this.appState.events.RENDER);
return; return;
} }
@ -169,7 +169,7 @@ export class LoginController extends ViewController {
console.error(response); console.error(response);
this.state.createError = __(response.message); this.state.createError = __(response.message);
this.state.isChecking = false; this.state.isChecking = false;
this.emit('render'); this.emit(this.appState.events.RENDER);
return; return;
} }

View File

@ -66,7 +66,7 @@ export class SearchController extends ViewController {
search() { search() {
if (this.hasQuery) { if (this.hasQuery) {
this.state.done = false; this.state.done = false;
this.emit('render', () => { this.emit(this.appState.events.RENDER, () => {
this.state.lastSearch = this.appState.query.for; this.state.lastSearch = this.appState.query.for;
this.state.lastSource = this.state.searchSource; this.state.lastSource = this.state.searchSource;
this.state.lastBy = this.state.searchBy; this.state.lastBy = this.state.searchBy;
@ -79,7 +79,7 @@ export class SearchController extends ViewController {
this.state.results = responseJSON; this.state.results = responseJSON;
this.state.done = true; this.state.done = true;
}) })
.then(() => this.emit('render')); .then(() => this.emit(this.appState.events.RENDER));
}); });
} }
} }
@ -143,7 +143,7 @@ export class SearchController extends ViewController {
shelvesPromise.then(() => { shelvesPromise.then(() => {
console.log(shelfController.state.myShelves); console.log(shelfController.state.myShelves);
this.showShelves = true; this.showShelves = true;
this.emit('render'); this.emit(this.appState.events.RENDER);
}); });
} }
@ -152,7 +152,7 @@ export class SearchController extends ViewController {
shelfController.addItemToShelf(bookData, shelfId).then(result => { shelfController.addItemToShelf(bookData, shelfId).then(result => {
console.log(result); console.log(result);
this.showShelves = false; this.showShelves = false;
this.emit('render'); this.emit(this.appState.events.RENDER);
}); });
} }
} }

View File

@ -24,7 +24,7 @@ export const shelfView = (shelvesController, emit) => {
if (typeof shelvesController.state.loadedShelves[shelvesController.targetShelf] === 'undefined') { if (typeof shelvesController.state.loadedShelves[shelvesController.targetShelf] === 'undefined') {
shelvesController.getTargetShelf().then(() => { shelvesController.getTargetShelf().then(() => {
emit('render'); emit(shelvesController.appState.events.RENDER);
}); });
} }
@ -77,7 +77,7 @@ export const shelfView = (shelvesController, emit) => {
<div class="third sixth-700"> <div class="third sixth-700">
<button class="pseudo" onclick=${() => { <button class="pseudo" onclick=${() => {
delete shelvesController.state.loadedShelves[shelvesController.targetShelf]; delete shelvesController.state.loadedShelves[shelvesController.targetShelf];
emit('render'); emit(shelvesController.appState.events.RENDER);
}}> }}>
Reload <i class="icon-reload"></i> Reload <i class="icon-reload"></i>
</button> </button>

View File

@ -22,7 +22,7 @@ export const userShelvesView = (shelvesController, emit) => {
if (shelvesController.state.myShelves.length <= 0) { if (shelvesController.state.myShelves.length <= 0) {
shelvesController.getUserShelves().then(() => { shelvesController.getUserShelves().then(() => {
emit('render'); emit(shelvesController.appState.events.RENDER);
}); });
} }