Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-07 16:37:02 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Put createCommandLegacy code in createCommand

Browse source
This commit is contained in:
djmaze 2020-08-22 09:35:24 +02:00
parent dc3b76f53a
commit 3374a2d2d3
1 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

27
dev/Knoin/Knoin.js
View file

@ -2,14 +2,13 @@ import ko from 'ko';
import { $htmlCL, VIEW_MODELS, popupVisibilityNames } from 'Common/Globals'; import { $htmlCL, VIEW_MODELS, popupVisibilityNames } from 'Common/Globals';
import { pString, createCommandLegacy, isNonEmptyArray } from 'Common/Utils';
//import { bMobileDevice } from 'Common/Globals'; //import { bMobileDevice } from 'Common/Globals';
let currentScreen = null, let currentScreen = null,
defaultScreenName = ''; defaultScreenName = '';
const SCREENS = {}, $ = jQuery; const SCREENS = {}, $ = jQuery,
isNonEmptyArray = values => Array.isArray(values) && values.length;
export const ViewType = { export const ViewType = {
Popup: 'Popups', Popup: 'Popups',
@ -34,7 +33,25 @@ export function hideLoading() {
* @returns {Function} * @returns {Function}
*/ */
export function createCommand(fExecute, fCanExecute = true) { export function createCommand(fExecute, fCanExecute = true) {
return createCommandLegacy(null, fExecute, fCanExecute); let fResult = null;
const fNonEmpty = (...args) => {
if (fResult && fResult.canExecute && fResult.canExecute()) {
fExecute.apply(null, args);
}
return false;
};
fResult = fExecute ? fNonEmpty : ()=>{};
fResult.enabled = ko.observable(true);
fResult.isCommand = true;
if (typeof fCanExecute === 'function') {
fResult.canExecute = ko.computed(() => fResult && fResult.enabled() && fCanExecute.call(null));
} else {
fResult.canExecute = ko.computed(() => fResult && fResult.enabled() && !!fCanExecute);
}
return fResult;
} }
/** /**
@ -260,7 +277,7 @@ export function screenOnRoute(screenName, subPart) {
isSameScreen = false, isSameScreen = false,
cross = null; cross = null;
if (!pString(screenName)) { if (null == screenName || '' == screenName) {
screenName = defaultScreenName; screenName = defaultScreenName;
} }