diff --git a/src/components/MainDisplay.jsx b/src/components/MainDisplay.jsx index 6c015e8..8beb835 100644 --- a/src/components/MainDisplay.jsx +++ b/src/components/MainDisplay.jsx @@ -57,7 +57,7 @@ export class MainDisplay extends Component { render () { const userData = store.get('LexicongaUserData'); - const itemsPerPage = userData ? userData.itemsPerPage : DEFAULT_USER_DATA.itemsPerPage; + const itemsPerPage = userData && userData.hasOwnProperty('itemsPerPage') ? userData.itemsPerPage : DEFAULT_USER_DATA.itemsPerPage; const { dictionaryInfo, isLoadingWords, diff --git a/src/components/management/AccountManager/index.jsx b/src/components/management/AccountManager/index.jsx index 6e4fe7f..0ad4166 100644 --- a/src/components/management/AccountManager/index.jsx +++ b/src/components/management/AccountManager/index.jsx @@ -24,12 +24,12 @@ export class AccountManager extends Component { this.state = { isLoggedIn: false, userData: { - email: userData ? userData.email : DEFAULT_USER_DATA.email, - username: userData ? userData.username : DEFAULT_USER_DATA.username, - publicName: userData ? userData.publicName : DEFAULT_USER_DATA.publicName, - allowEmails: userData ? userData.allowEmails : DEFAULT_USER_DATA.allowEmails, - useIPAPronunciation: userData ? userData.useIPAPronunciation : DEFAULT_USER_DATA.useIPAPronunciation, - itemsPerPage: userData ? userData.itemsPerPage : DEFAULT_USER_DATA.itemsPerPage, + email: userData && userData.hasOwnProperty('email') ? userData.email : DEFAULT_USER_DATA.email, + username: userData && userData.hasOwnProperty('username') ? userData.username : DEFAULT_USER_DATA.username, + publicName: userData && userData.hasOwnProperty('publicName') ? userData.publicName : DEFAULT_USER_DATA.publicName, + allowEmails: userData && userData.hasOwnProperty('allowEmails') ? userData.allowEmails : DEFAULT_USER_DATA.allowEmails, + useIPAPronunciation: userData && userData.hasOwnProperty('useIPAPronunciation') ? userData.useIPAPronunciation : DEFAULT_USER_DATA.useIPAPronunciation, + itemsPerPage: userData && userData.hasOwnProperty('itemsPerPage') ? userData.itemsPerPage : DEFAULT_USER_DATA.itemsPerPage, }, userDictionaries: [], }; diff --git a/src/components/management/WordForm.jsx b/src/components/management/WordForm.jsx index fffc32f..c4a624c 100644 --- a/src/components/management/WordForm.jsx +++ b/src/components/management/WordForm.jsx @@ -104,7 +104,8 @@ export class WordForm extends Component { render () { const userData = store.get('LexicongaUserData'); - const useIpaField = userData ? userData.useIPAPronunciation : DEFAULT_USER_DATA.useIPAPronunciation; + const useIpaField = userData && userData.hasOwnProperty('useIPAPronunciation') + ? userData.useIPAPronunciation : DEFAULT_USER_DATA.useIPAPronunciation; return (