From 052f5f23cc3b08136146e20b0ca5e3a4342dc8ec Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Wed, 7 Jul 2021 12:31:01 +0200
Subject: [PATCH] Remove framework object from import statement which would
 override the actual object

---
 api/js/etemplate/et2_widget_tree.ts | 2 +-
 api/js/framework/fw_base.js         | 2 +-
 api/js/jsapi/egw_global.d.ts        | 1 -
 calendar/js/app.ts                  | 3 +--
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/api/js/etemplate/et2_widget_tree.ts b/api/js/etemplate/et2_widget_tree.ts
index 908eaf2e27..8db1b02d58 100644
--- a/api/js/etemplate/et2_widget_tree.ts
+++ b/api/js/etemplate/et2_widget_tree.ts
@@ -25,7 +25,7 @@ import {et2_register_widget, WidgetConfig} from "./et2_core_widget";
 import {et2_inputWidget} from "./et2_core_inputWidget";
 import {ClassWithAttributes} from "./et2_core_inheritance";
 import {et2_no_init} from "./et2_core_common";
-import {egw, framework} from "../jsapi/egw_global";
+import {egw} from "../jsapi/egw_global";
 import {egw_getAppObjectManager, egw_getObjectManager, egwActionObject} from "../egw_action/egw_action.js";
 import {EGW_AO_FLAG_IS_CONTAINER} from "../egw_action/egw_action_constants.js";
 import {dhtmlxtreeItemAOI} from "../egw_action/egw_dragdrop_dhtmlx_tree.js";
diff --git a/api/js/framework/fw_base.js b/api/js/framework/fw_base.js
index a02bc6c90e..9a20f39f43 100644
--- a/api/js/framework/fw_base.js
+++ b/api/js/framework/fw_base.js
@@ -24,7 +24,7 @@ window.fw_base = (function(){ "use strict"; return Class.extend(
 	 * @returns {undefined}
 	 */
 	init: function (_sidemenuId, _tabsId, _webserverUrl, _sideboxSizeCallback){
-		window.framework = this;
+
 		/* Get the base div */
 		this.sidemenuDiv = document.getElementById(_sidemenuId);
 		this.tabsDiv = document.getElementById(_tabsId);
diff --git a/api/js/jsapi/egw_global.d.ts b/api/js/jsapi/egw_global.d.ts
index 763481eaf9..7f31c87821 100644
--- a/api/js/jsapi/egw_global.d.ts
+++ b/api/js/jsapi/egw_global.d.ts
@@ -1302,7 +1302,6 @@ declare var chrome : any;
 declare var InstallTrigger : any;
 declare var app : {classes: any, [propName: string]: EgwApp};
 declare var egw_globalObjectManager : any;
-declare var framework : any;
 declare var egw_LAB : any;
 declare function egwIsMobile() : string|null;
 
diff --git a/calendar/js/app.ts b/calendar/js/app.ts
index 4a6f3eb77d..1892521640 100644
--- a/calendar/js/app.ts
+++ b/calendar/js/app.ts
@@ -43,8 +43,7 @@ import {et2_iframe} from "../../api/js/etemplate/et2_widget_iframe";
 import {date} from "../../api/js/etemplate/lib/date.js";
 import {sprintf} from "../../api/js/egw_action/egw_action_common.js";
 import {egw_registerGlobalShortcut} from "../../api/js/egw_action/egw_keymanager.js";
-
-import {egw, egw_getFramework, framework} from "../../api/js/jsapi/egw_global";
+import {egw, egw_getFramework} from "../../api/js/jsapi/egw_global";
 import {et2_number} from "../../api/js/etemplate/et2_widget_number";
 import {et2_template} from "../../api/js/etemplate/et2_widget_template";
 import {et2_checkbox} from "../../api/js/etemplate/et2_widget_checkbox";