From 68fdb1b98544dfd1cd1242c84e5bfaf670c8eb8a Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Tue, 21 Feb 2023 13:02:23 +0100 Subject: [PATCH] Revert "changes to get old eTemplate apps like KnowledgeBase working in 23.1" This reverts commit d816d837cdf210285343c5ad0c5293aa0c777bc0. --- api/js/egw_action/egw_action.js | 17 +---------------- api/js/egw_action/egw_action_common.js | 7 ------- api/js/egw_action/egw_action_popup.js | 2 +- api/js/tapandswipe.js | 2 -- 4 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 api/js/tapandswipe.js diff --git a/api/js/egw_action/egw_action.js b/api/js/egw_action/egw_action.js index ec74d35272..fefd94268d 100644 --- a/api/js/egw_action/egw_action.js +++ b/api/js/egw_action/egw_action.js @@ -26,8 +26,7 @@ import { EGW_KEY_PAGE_DOWN, EGW_AO_EXEC_THIS, EGW_AO_EXEC_SELECTED, - EGW_KEY_A, EGW_KEY_SPACE, - EGW_AO_FLAG_DEFAULT_FOCUS + EGW_KEY_A, EGW_KEY_SPACE } from './egw_action_constants.js'; import {egwFnct, egwActionStoreJSON, egwBitIsSet, egwQueueCallback, egwSetBit, egwObjectLength} from './egw_action_common.js'; import './egw_action_popup.js'; @@ -2529,17 +2528,3 @@ export function egwActionObjectManager(_id, _manager) return ao; } - -// make some functions available globally for old eTemplate apps like KnowledgeBase -if (typeof window.egw_getActionManager === 'undefined') -{ - window.egw_globalObjectManager = egw_globalObjectManager; - window.egw_getActionManager = egw_getActionManager; - window.egw_getObjectManager = egw_getObjectManager; - window.egwActionObjectManager = egwActionObjectManager; - window.egwActionObjectInterface = egwActionObjectInterface; - window.EGW_AO_FLAG_DEFAULT_FOCUS = EGW_AO_FLAG_DEFAULT_FOCUS; - window.EGW_AO_STATE_SELECTED = EGW_AO_STATE_SELECTED; - window.EGW_AO_SHIFT_STATE_MULTI = EGW_AO_SHIFT_STATE_MULTI; - window.EGW_AO_STATE_FOCUSED = EGW_AO_STATE_FOCUSED; -} \ No newline at end of file diff --git a/api/js/egw_action/egw_action_common.js b/api/js/egw_action/egw_action_common.js index d1b8bb27af..ea45b11b13 100644 --- a/api/js/egw_action/egw_action_common.js +++ b/api/js/egw_action/egw_action_common.js @@ -517,11 +517,4 @@ export function sprintf() { f = f.substring(m[0].length); } return o.join(''); -} -// make some functions global for old eTemplate apps like KnowledgeBase -if (typeof window.egwPreventSelect === 'undefined') -{ - window.egwPreventSelect = egwPreventSelect; - window.egwBitIsSet = egwBitIsSet; - window.egwUnfocus = egwUnfocus; } \ No newline at end of file diff --git a/api/js/egw_action/egw_action_popup.js b/api/js/egw_action/egw_action_popup.js index d9e0d6bc79..29950e5de7 100644 --- a/api/js/egw_action/egw_action_popup.js +++ b/api/js/egw_action/egw_action_popup.js @@ -18,7 +18,7 @@ import {egwAction, egwActionImplementation, egwActionObject} from './egw_action. import {egwFnct} from './egw_action_common.js'; import {egwMenu, _egw_active_menu} from "./egw_menu.js"; import {EGW_KEY_ENTER, EGW_KEY_MENU} from "./egw_action_constants.js"; -import {tapAndSwipe} from "../tapandswipe.js"; +import {tapAndSwipe} from "../tapandswipe"; if (typeof window._egwActionClasses == "undefined") window._egwActionClasses = {}; diff --git a/api/js/tapandswipe.js b/api/js/tapandswipe.js deleted file mode 100644 index 54ae972bf4..0000000000 --- a/api/js/tapandswipe.js +++ /dev/null @@ -1,2 +0,0 @@ -// dummy to get egw_actions work with old eTemplate, 23.1+ plus uses the complied TS file -export function tapAndSwipe() {} \ No newline at end of file