From 8313c93a3122d99999208d131bbddc055f87b1fb Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Fri, 25 Feb 2022 17:20:47 +0100 Subject: [PATCH] Fix addressbook contextmenu gets broken after re-compiling app.ts (some trunk changes sneaked into 21.1 via https://github.com/EGroupware/egroupware/commit/a728276a151cb6afd42a430b917a334f06208cb5) --- addressbook/js/app.ts | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/addressbook/js/app.ts b/addressbook/js/app.ts index 4f6ff19101..adb6c03cfe 100644 --- a/addressbook/js/app.ts +++ b/addressbook/js/app.ts @@ -3,9 +3,8 @@ * * @link: https://www.egroupware.org * @package addressbook - * @author Hadi Nategh - * @author Ralf Becker - * @copyright (c) 2008-21 by Ralf Becker + * @author Hadi Nategh + * @copyright (c) 2008-13 by Ralf Becker * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License */ @@ -13,13 +12,13 @@ /api/js/jsapi/egw_app.js */ +import 'jquery'; +import 'jqueryui'; +import '../jsapi/egw_global'; +import '../etemplate/et2_types'; + import {EgwApp, PushData} from '../../api/js/jsapi/egw_app'; import {etemplate2} from "../../api/js/etemplate/etemplate2"; -import {et2_dialog} from "../../api/js/etemplate/et2_widget_dialog"; -import {et2_selectbox} from "../../api/js/etemplate/et2_widget_selectbox"; -import {nm_action, fetchAll} from "../../api/js/etemplate/et2_extension_nextmatch_actions.js"; -import "./CRM.js"; -import {egw} from "../../api/js/jsapi/egw_global"; /** * Object to call app.addressbook.openCRMview with @@ -696,11 +695,11 @@ class AddressbookApp extends EgwApp { content.push({"confirm":id,"name":_data.doublicates[id]}); } - confirmdialog(this.egw.lang('Duplicate warning'),content,et2_dialog.BUTTONS_OK_CANCEL); + confirmdialog(this.egw.lang('Duplicate warning'),content,et2_dialog.BUTTONs_OK_CANCEL); } if (typeof _data.fileas_options == 'object' && this.et2) { - var selbox = this.et2.getWidgetById('fileas_type'); + var selbox = this.et2.getWidgetById('fileas_type'); if (selbox) { selbox.set_select_options(_data.fileas_sel_options);