cleanup some code

This commit is contained in:
djmaze 2020-10-02 12:40:33 +02:00
parent e566494a87
commit cb2048f163
14 changed files with 32 additions and 117 deletions

View file

@ -18,9 +18,7 @@ export class AbstractModel {
regDisposables(value) {
if (Array.isArray(value)) {
value.forEach((item) => {
this.disposables.push(item);
});
value.forEach(item => this.disposables.push(item));
} else if (value) {
this.disposables.push(value);
}

View file

@ -32,7 +32,7 @@ export class AbstractScreen {
/**
* @returns {?Object}
*/
__cross() {
get __cross() {
return this.oCross;
}

View file

@ -9,7 +9,7 @@ export class AbstractViewNext {
sDefaultKeyScope = KeyState.None;
sCurrentKeyScope = KeyState.None;
viewModelVisibility = ko.observable(false);
viewModelVisible = false;
modalVisibility = ko.observable(false).extend({ rateLimit: 0 });
viewModelName = '';

View file

@ -249,8 +249,7 @@ export function isPopupVisible(ViewModelClassToShow) {
*/
function screenOnRoute(screenName, subPart) {
let vmScreen = null,
isSameScreen = false,
cross = null;
isSameScreen = false;
if (null == screenName || '' == screenName) {
screenName = defaultScreenName;
@ -295,7 +294,7 @@ function screenOnRoute(screenName, subPart) {
ViewType.Popup !== ViewModelClass.__vm.viewModelPosition
) {
ViewModelClass.__dom.hidden = true;
ViewModelClass.__vm.viewModelVisibility(false);
ViewModelClass.__vm.viewModelVisible = false;
ViewModelClass.__vm.onHide && ViewModelClass.__vm.onHide();
ViewModelClass.__vm.onHideWithDelay && setTimeout(()=>ViewModelClass.__vm.onHideWithDelay(), 500);
@ -321,7 +320,7 @@ function screenOnRoute(screenName, subPart) {
ViewModelClass.__vm.onBeforeShow && ViewModelClass.__vm.onBeforeShow();
ViewModelClass.__dom.hidden = false;
ViewModelClass.__vm.viewModelVisibility(true);
ViewModelClass.__vm.viewModelVisible = true;
ViewModelClass.__vm.onShow && ViewModelClass.__vm.onShow();
@ -334,10 +333,7 @@ function screenOnRoute(screenName, subPart) {
}
// --
cross = vmScreen && vmScreen.__cross ? vmScreen.__cross() : null;
if (cross) {
cross.parse(subPart);
}
vmScreen && vmScreen.__cross && vmScreen.__cross.parse(subPart);
}, 1);
}
}