From 239a81e6d9c121625d488ff9020564ed35e28a2a Mon Sep 17 00:00:00 2001 From: ralf Date: Sat, 6 Aug 2022 08:38:16 +0200 Subject: [PATCH] replace et2_link_add with a stub and no longer include it in etemplate2.ts --- api/js/etemplate/et2_widget_link.ts | 95 +---------------------------- api/js/etemplate/etemplate2.ts | 1 - 2 files changed, 3 insertions(+), 93 deletions(-) diff --git a/api/js/etemplate/et2_widget_link.ts b/api/js/etemplate/et2_widget_link.ts index bab61ef37e..7816619cbb 100644 --- a/api/js/etemplate/et2_widget_link.ts +++ b/api/js/etemplate/et2_widget_link.ts @@ -9,27 +9,13 @@ * @copyright 2011 Nathan Gray */ -/*egw:uses - /vendor/bower-asset/jquery/dist/jquery.js; - /vendor/bower-asset/jquery-ui/jquery-ui.js; - et2_core_inputWidget; - et2_core_valueWidget; - et2_widget_selectbox; - - // Include menu system for list context menu - egw_action.egw_menu_dhtmlx; -*/ - -import {et2_createWidget, et2_register_widget, et2_widget, WidgetConfig} from "./et2_core_widget"; -import {ClassWithAttributes} from "./et2_core_inheritance"; -import {et2_inputWidget} from "./et2_core_inputWidget"; -import {et2_button} from "./et2_widget_button"; import {Et2LinkList} from "./Et2Link/Et2LinkList"; import type {Et2LinkString} from "./Et2Link/Et2LinkString"; import {Et2Link} from "./Et2Link/Et2Link"; import type {Et2LinkTo} from "./Et2Link/Et2LinkTo"; import type {Et2LinkAppSelect} from "./Et2Link/Et2LinkAppSelect"; import type {Et2LinkEntry, Et2LinkEntryReadonly} from "./Et2Link/Et2LinkEntry"; +import {Et2LinkAdd} from "./Et2Link/Et2LinkAdd"; /** * @deprecated use Et2LinkTo @@ -69,81 +55,6 @@ export type et2_link_string = Et2LinkString; export class et2_link_list extends Et2LinkList {} /** - * - * + * @deprecated use Et2LinkAdd */ -export class et2_link_add extends et2_inputWidget -{ - static readonly _attributes: any = { - "value": { - "description": "Either an array of link information (see egw_link::link()) or array with keys to_app and to_id", - "type": "any" - }, - "application": { - "name": "Application", - "type": "string", - "default": "", - "description": "Limit to the listed application or applications (comma seperated)" - } - }; - private span: JQuery; - private div: JQuery; - private app_select: et2_link_apps; - private button: et2_button; - - /** - * Constructor - */ - constructor(_parent: et2_widget, _attrs?: WidgetConfig, _child?: object) - { - super(_parent, _attrs, ClassWithAttributes.extendAttributes(et2_link_add._attributes, _child || {})); - - - this.span = jQuery(document.createElement("span")) - .text(this.egw().lang("Add new")) - .addClass('et2_link_add_span'); - this.div = jQuery(document.createElement("div")).append(this.span); - this.setDOMNode(this.div[0]); - } - - doLoadingFinished() - { - super.doLoadingFinished.apply(this, arguments); - if (this.app_select && this.button) - { - // Already done - return false; - } - this.app_select = et2_createWidget("link-apps", jQuery.extend({}, this.options, { - 'id': this.options.id + 'app', - value: this.options.application ? this.options.application : this.options.value && this.options.value.add_app ? this.options.value.add_app : null, - application_list: this.options.application ? this.options.application : null - }), this); - this.div.append(this.app_select); - this.button = et2_createWidget("button", { - id: this.options.id + "_add", - label: this.egw().lang("add") - }, this); - this.button.set_label(this.egw().lang("add")); - var self = this; - this.button.click = function () - { - self.egw().open(self.options.value.to_app + ":" + self.options.value.to_id, self.app_select.value, 'add'); - return false; - }; - this.div.append(this.button.getDOMNode()); - - return true; - } - - /** - * Should be handled client side. - * Return null to avoid overwriting other link values, in case designer used the same ID for multiple widgets - */ - getValue() - { - return null; - } -} - -et2_register_widget(et2_link_add, ["link-add"]); \ No newline at end of file +export type et2_link_add = Et2LinkAdd; \ No newline at end of file diff --git a/api/js/etemplate/etemplate2.ts b/api/js/etemplate/etemplate2.ts index d5e9061ee9..22eb5233d5 100644 --- a/api/js/etemplate/etemplate2.ts +++ b/api/js/etemplate/etemplate2.ts @@ -129,7 +129,6 @@ import './et2_widget_hrule'; import './et2_widget_image'; import './et2_widget_iframe'; import './et2_widget_file'; -import './et2_widget_link'; import './et2_widget_placeholder'; import './et2_widget_progress'; import './et2_widget_portlet';