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

fix not working add in calendar (et2_valueWidget not defined)

Browse Source 
instead of checking widget to be instance of valueWidget (which would create a circular dependency) we check for the interface/methods of valueWidget
This commit is contained in:
Ralf Becker 2021-06-11 14:50:37 +02:00
parent 506111d044
commit 587c4fd8fd
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/js/etemplate/et2_core_baseWidget.js
View File

@ -284,7 +284,9 @@ export class et2_container extends et2_baseWidget {
*/ */
getInputWidgetById(_id) { getInputWidgetById(_id) {
let widget = this.getWidgetById(_id); let widget = this.getWidgetById(_id);
if (widget && widget.instanceOf(et2_valueWidget)) { // instead of checking widget to be instance of valueWidget (which would create a circular dependency)
// we check for the interface/methods of valueWidget
if (widget && typeof widget.get_value === 'function' && typeof widget.set_value === 'function') {
return widget; return widget;
} }
return null; return null;

9
api/js/etemplate/et2_core_baseWidget.ts
View File

@ -21,7 +21,6 @@ import {et2_register_widget, et2_widget, WidgetConfig} from "./et2_core_widget";
import {et2_no_init} from "./et2_core_common"; import {et2_no_init} from "./et2_core_common";
// fixing circular dependencies by only importing type // fixing circular dependencies by only importing type
import type {et2_inputWidget} from "./et2_core_inputWidget"; import type {et2_inputWidget} from "./et2_core_inputWidget";
import type {et2_valueWidget} from "./et2_core_valueWidget";
import {egwIsMobile} from "../egw_action/egw_action_common.js"; import {egwIsMobile} from "../egw_action/egw_action_common.js";
/** /**
@ -383,10 +382,12 @@ export class et2_container extends et2_baseWidget
*/ */
getInputWidgetById(_id) : et2_inputWidget | null getInputWidgetById(_id) : et2_inputWidget | null
{ {
let widget = this.getWidgetById(_id); let widget = <any>this.getWidgetById(_id);
if(widget && widget.instanceOf(et2_valueWidget)) // instead of checking widget to be instance of valueWidget (which would create a circular dependency)
// we check for the interface/methods of valueWidget
if(widget && typeof widget.get_value === 'function' && typeof widget.set_value === 'function')
{ {
return <et2_inputWidget><unknown>widget; return <et2_inputWidget>widget;
} }
return null return null
} }