isNonEmptyArray => arrayLength

This commit is contained in:
djmaze 2021-07-21 21:34:17 +02:00
parent 1e49c1a6ac
commit 5590fd4860
20 changed files with 68 additions and 74 deletions

View file

@ -1,4 +1,4 @@
import { isArray, isNonEmptyArray } from 'Common/Utils';
import { isArray, arrayLength } from 'Common/Utils';
export class AbstractScreen {
constructor(screenName, viewModels = []) {
@ -42,7 +42,7 @@ export class AbstractScreen {
if (!this.__started) {
this.__started = true;
const routes = this.routes();
if (isNonEmptyArray(routes)) {
if (arrayLength(routes)) {
let route = new Crossroads(),
fMatcher = (this.onRoute || (()=>{})).bind(this);

View file

@ -1,7 +1,7 @@
import ko from 'ko';
import { doc, $htmlCL } from 'Common/Globals';
import { isNonEmptyArray, isFunction } from 'Common/Utils';
import { arrayLength, isFunction } from 'Common/Utils';
let currentScreen = null,
defaultScreenName = '';
@ -227,7 +227,7 @@ function screenOnRoute(screenName, subPart) {
currentScreen.onHide && currentScreen.onHide();
currentScreen.onHideWithDelay && setTimeout(()=>currentScreen.onHideWithDelay(), 500);
if (isNonEmptyArray(currentScreen.viewModels)) {
if (arrayLength(currentScreen.viewModels)) {
currentScreen.viewModels.forEach(ViewModelClass => {
if (
ViewModelClass.__vm &&
@ -251,7 +251,7 @@ function screenOnRoute(screenName, subPart) {
if (currentScreen && !isSameScreen) {
currentScreen.onShow && currentScreen.onShow();
if (isNonEmptyArray(currentScreen.viewModels)) {
if (arrayLength(currentScreen.viewModels)) {
currentScreen.viewModels.forEach(ViewModelClass => {
if (
ViewModelClass.__vm &&