extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove framework object from import statement which would override the actual object

Browse Source
This commit is contained in:
Hadi Nategh 2021-07-07 12:31:01 +02:00
parent 90f1d9ea37
commit 052f5f23cc
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/js/etemplate/et2_widget_tree.ts
View File

@ -25,7 +25,7 @@ import {et2_register_widget, WidgetConfig} from "./et2_core_widget";
import {et2_inputWidget} from "./et2_core_inputWidget"; import {et2_inputWidget} from "./et2_core_inputWidget";
import {ClassWithAttributes} from "./et2_core_inheritance"; import {ClassWithAttributes} from "./et2_core_inheritance";
import {et2_no_init} from "./et2_core_common"; 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_getAppObjectManager, egw_getObjectManager, egwActionObject} from "../egw_action/egw_action.js";
import {EGW_AO_FLAG_IS_CONTAINER} from "../egw_action/egw_action_constants.js"; import {EGW_AO_FLAG_IS_CONTAINER} from "../egw_action/egw_action_constants.js";
import {dhtmlxtreeItemAOI} from "../egw_action/egw_dragdrop_dhtmlx_tree.js"; import {dhtmlxtreeItemAOI} from "../egw_action/egw_dragdrop_dhtmlx_tree.js";

2
api/js/framework/fw_base.js
View File

@ -24,7 +24,7 @@ window.fw_base = (function(){ "use strict"; return Class.extend(
* @returns {undefined} * @returns {undefined}
*/ */
init: function (_sidemenuId, _tabsId, _webserverUrl, _sideboxSizeCallback){ init: function (_sidemenuId, _tabsId, _webserverUrl, _sideboxSizeCallback){
window.framework = this;
/* Get the base div */ /* Get the base div */
this.sidemenuDiv = document.getElementById(_sidemenuId); this.sidemenuDiv = document.getElementById(_sidemenuId);
this.tabsDiv = document.getElementById(_tabsId); this.tabsDiv = document.getElementById(_tabsId);

1
api/js/jsapi/egw_global.d.ts vendored
View File

@ -1302,7 +1302,6 @@ declare var chrome : any;
declare var InstallTrigger : any; declare var InstallTrigger : any;
declare var app : {classes: any, [propName: string]: EgwApp}; declare var app : {classes: any, [propName: string]: EgwApp};
declare var egw_globalObjectManager : any; declare var egw_globalObjectManager : any;
declare var framework : any;
declare var egw_LAB : any; declare var egw_LAB : any;
declare function egwIsMobile() : string|null; declare function egwIsMobile() : string|null;

3
calendar/js/app.ts
View File

@ -43,8 +43,7 @@ import {et2_iframe} from "../../api/js/etemplate/et2_widget_iframe";
import {date} from "../../api/js/etemplate/lib/date.js"; import {date} from "../../api/js/etemplate/lib/date.js";
import {sprintf} from "../../api/js/egw_action/egw_action_common.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_registerGlobalShortcut} from "../../api/js/egw_action/egw_keymanager.js";
import {egw, egw_getFramework} from "../../api/js/jsapi/egw_global";
import {egw, egw_getFramework, framework} from "../../api/js/jsapi/egw_global";
import {et2_number} from "../../api/js/etemplate/et2_widget_number"; import {et2_number} from "../../api/js/etemplate/et2_widget_number";
import {et2_template} from "../../api/js/etemplate/et2_widget_template"; import {et2_template} from "../../api/js/etemplate/et2_widget_template";
import {et2_checkbox} from "../../api/js/etemplate/et2_widget_checkbox"; import {et2_checkbox} from "../../api/js/etemplate/et2_widget_checkbox";