Added isFunction()

This commit is contained in:
djmaze 2021-03-24 14:22:25 +01:00
parent 658ac816c8
commit fe4dbc729c
6 changed files with 13 additions and 21 deletions

View file

@ -1,5 +1,6 @@
import { Scope } from 'Common/Enums';
import { i18n } from 'Common/Translator';
import { isFunction } from 'Common/Utils';
import { AbstractViewPopup } from 'Knoin/AbstractViews';
@ -32,17 +33,13 @@ class AskPopupView extends AbstractViewPopup {
yesClick() {
this.cancelCommand();
if (typeof this.fYesAction === 'function') {
this.fYesAction.call(null);
}
isFunction(this.fYesAction) && this.fYesAction.call(null);
}
noClick() {
this.cancelCommand();
if (typeof this.fNoAction === 'function') {
this.fNoAction.call(null);
}
isFunction(this.fNoAction) && this.fNoAction.call(null);
}
/**

View file

@ -1,11 +1,8 @@
import ko from 'ko';
import {
Notification
} from 'Common/Enums';
import { Notification } from 'Common/Enums';
import { ClientSideKeyName } from 'Common/EnumsUser';
import { Settings, SettingsGet } from 'Common/Globals';
import { getNotification, reload as translatorReload, convertLangName } from 'Common/Translator';
import { LanguageStore } from 'Stores/Language';
@ -17,8 +14,6 @@ import Remote from 'Remote/User/Fetch';
import { decorateKoCommands, showScreenPopup } from 'Knoin/Knoin';
import { AbstractViewCenter } from 'Knoin/AbstractViews';
import { Settings, SettingsGet } from 'Common/Globals';
import { LanguagesPopupView } from 'View/Popup/Languages';
const
@ -131,8 +126,8 @@ class LoginUserView extends AbstractViewCenter {
this.emailError(!email);
this.passwordError(!pass);
this.formError(!valid);
this.additionalCodeError(totp && !code);
this.formError(!valid);
if (valid) {
this.submitRequest(true);