From 0de8f242aa3d9a79b9b76a5bc075cf18632f9b1c Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Thu, 10 Jun 2021 13:59:12 +0200 Subject: [PATCH] Fix missing dhtmlx menu object --- api/js/egw_action/egw_menu.js | 2 +- api/js/egw_action/egw_menu_dhtmlx.js | 2 +- timesheet/js/app.js | 1 + timesheet/js/app.ts | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/api/js/egw_action/egw_menu.js b/api/js/egw_action/egw_menu.js index 3152ce7280..1350404c28 100644 --- a/api/js/egw_action/egw_menu.js +++ b/api/js/egw_action/egw_menu.js @@ -9,7 +9,7 @@ * * @Todo: @new-js-loader port to TypeScript */ - +import {egwMenuImpl} from './egw_menu_dhtmlx.js'; //Global variable which is used to store the currently active menu so that it //may be closed when another menu openes export var _egw_active_menu = null; diff --git a/api/js/egw_action/egw_menu_dhtmlx.js b/api/js/egw_action/egw_menu_dhtmlx.js index 477414fb1e..cb39eba0c8 100644 --- a/api/js/egw_action/egw_menu_dhtmlx.js +++ b/api/js/egw_action/egw_menu_dhtmlx.js @@ -23,7 +23,7 @@ * * @param {type} _structure */ -function egwMenuImpl(_structure) +export function egwMenuImpl(_structure) { //Create a new dhtmlxmenu object this.dhtmlxmenu = new dhtmlXMenuObject(); diff --git a/timesheet/js/app.js b/timesheet/js/app.js index d8769eb440..652b54cbf5 100644 --- a/timesheet/js/app.js +++ b/timesheet/js/app.js @@ -12,6 +12,7 @@ */ import '../../api/js/jsapi/egw_global'; import { EgwApp } from '../../api/js/jsapi/egw_app'; +import { egw } from "../../api/js/jsapi/egw_global"; /** * UI for timesheet * diff --git a/timesheet/js/app.ts b/timesheet/js/app.ts index 6687c3657a..bf5b46d883 100644 --- a/timesheet/js/app.ts +++ b/timesheet/js/app.ts @@ -14,6 +14,7 @@ import '../../api/js/jsapi/egw_global'; import {EgwApp} from '../../api/js/jsapi/egw_app'; +import {egw} from "../../api/js/jsapi/egw_global"; /** * UI for timesheet