From bddcf72728eabc46c8f1ff3bf0359d0b1f2929c2 Mon Sep 17 00:00:00 2001 From: nathan Date: Wed, 3 Aug 2022 16:05:50 -0600 Subject: [PATCH] Get collabora placeholder dialog working again in trunk --- api/js/etemplate/et2_widget_placeholder.ts | 69 ++++++++----------- .../default/insert_merge_placeholder.xet | 9 ++- api/templates/default/placeholder_snippet.xet | 31 --------- 3 files changed, 33 insertions(+), 76 deletions(-) diff --git a/api/js/etemplate/et2_widget_placeholder.ts b/api/js/etemplate/et2_widget_placeholder.ts index 64ad03637b..2419e33ce9 100644 --- a/api/js/etemplate/et2_widget_placeholder.ts +++ b/api/js/etemplate/et2_widget_placeholder.ts @@ -18,12 +18,11 @@ import {et2_register_widget, WidgetConfig} from "./et2_core_widget"; import {ClassWithAttributes} from "./et2_core_inheritance"; import {et2_inputWidget} from "./et2_core_inputWidget"; -import type {egw} from "../jsapi/egw_global"; -import {et2_selectbox} from "./et2_widget_selectbox"; -import {et2_description} from "./et2_widget_description"; -import {et2_link_entry} from "./et2_widget_link"; -import type {et2_button} from "./et2_widget_button"; import {Et2Dialog} from "./Et2Dialog/Et2Dialog"; +import {Et2LinkEntry} from "./Et2Link/Et2LinkEntry"; +import {Et2Select} from "./Et2Select/Et2Select"; +import {Et2Description} from "./Et2Description/Et2Description"; +import {Et2Button} from "./Et2Button/Et2Button"; /** @@ -201,21 +200,14 @@ export class et2_placeholder_select extends et2_inputWidget */ _on_template_load() { - let app = this.dialog.template.widgetContainer.getDOMWidgetById("app"); - let group = this.dialog.template.widgetContainer.getDOMWidgetById("group"); - let placeholder_list = this.dialog.template.widgetContainer.getDOMWidgetById("placeholder_list"); - let preview = this.dialog.template.widgetContainer.getDOMWidgetById("preview_placeholder"); - let entry = this.dialog.template.widgetContainer.getDOMWidgetById("entry"); - + let app = this.dialog.template.widgetContainer.getDOMWidgetById("app"); + let group = this.dialog.template.widgetContainer.getDOMWidgetById("group"); + let placeholder_list = this.dialog.template.widgetContainer.getDOMWidgetById("placeholder_list"); + let preview = this.dialog.template.widgetContainer.getDOMWidgetById("preview_placeholder"); + let entry = this.dialog.template.widgetContainer.getDOMWidgetById("entry"); placeholder_list.set_select_options(this._get_placeholders(app.get_value(), group.get_value())); - // Further setup / styling that can't be done in etemplate - this.dialog.template.DOMContainer.style.display = "flex"; - this.dialog.template.DOMContainer.firstChild.style.display = "flex"; - group.getDOMNode().size = 5; - placeholder_list.getDOMNode().size = 5; - // Bind some handlers app.onchange = (node, widget) => { @@ -224,7 +216,6 @@ export class et2_placeholder_select extends et2_inputWidget { // These ones don't let you select an entry for preview (they don't work) entry.set_disabled(true); - entry.app_select.val('user'); entry.set_value({app: 'user', id: '', query: ''}); } else if(widget.get_value() == 'general') @@ -237,7 +228,6 @@ export class et2_placeholder_select extends et2_inputWidget // Load app translations this.egw().langRequireApp(this.egw().window, widget.get_value()); entry.set_disabled(false); - entry.app_select.val(widget.get_value()); entry.set_value({app: widget.get_value(), id: '', query: ''}); } let groups = this._get_group_options(widget.get_value()); @@ -254,11 +244,11 @@ export class et2_placeholder_select extends et2_inputWidget } placeholder_list.onchange = this._on_placeholder_select.bind(this); entry.onchange = this._on_placeholder_select.bind(this); - (this.dialog.template.widgetContainer.getDOMWidgetById("insert_placeholder")).onclick = () => + (this.dialog.template.widgetContainer.getDOMWidgetById("insert_placeholder")).onclick = () => { this.options.insert_callback(this.dialog.template.widgetContainer.getDOMWidgetById("preview_placeholder").getDOMNode().textContent); }; - (this.dialog.template.widgetContainer.getDOMWidgetById("insert_content")).onclick = () => + (this.dialog.template.widgetContainer.getDOMWidgetById("insert_content")).onclick = () => { this.options.insert_callback(this.dialog.template.widgetContainer.getDOMWidgetById("preview_content").getDOMNode().textContent); }; @@ -272,11 +262,11 @@ export class et2_placeholder_select extends et2_inputWidget */ _on_placeholder_select() { - let app = this.dialog.template.widgetContainer.getDOMWidgetById("app"); - let entry = this.dialog.template.widgetContainer.getDOMWidgetById("entry"); - let placeholder_list = this.dialog.template.widgetContainer.getDOMWidgetById("placeholder_list"); - let preview = this.dialog.template.widgetContainer.getDOMWidgetById("preview_placeholder"); - let preview_content = this.dialog.template.widgetContainer.getDOMWidgetById("preview_content"); + let app = this.dialog.template.widgetContainer.getDOMWidgetById("app"); + let entry = this.dialog.template.widgetContainer.getDOMWidgetById("entry"); + let placeholder_list = this.dialog.template.widgetContainer.getDOMWidgetById("placeholder_list"); + let preview = this.dialog.template.widgetContainer.getDOMWidgetById("preview_placeholder"); + let preview_content = this.dialog.template.widgetContainer.getDOMWidgetById("preview_content"); // Show the selected placeholder this.set_value(placeholder_list.get_value()); @@ -443,19 +433,16 @@ export class et2_placeholder_snippet_select extends et2_placeholder_select */ _on_template_load() { - let app = this.dialog.template.widgetContainer.getDOMWidgetById("app"); - let placeholder_list = this.dialog.template.widgetContainer.getDOMWidgetById("placeholder_list"); - let preview = this.dialog.template.widgetContainer.getDOMWidgetById("preview_content"); - let entry = this.dialog.template.widgetContainer.getDOMWidgetById("entry"); + let app = this.dialog.template.widgetContainer.getDOMWidgetById("app"); + let placeholder_list = this.dialog.template.widgetContainer.getDOMWidgetById("placeholder_list"); + let preview = this.dialog.template.widgetContainer.getDOMWidgetById("preview_content"); + let entry = this.dialog.template.widgetContainer.getDOMWidgetById("entry"); placeholder_list.set_select_options(this._get_placeholders("addressbook", "addresses")); // Further setup / styling that can't be done in etemplate - app.getInputNode().setAttribute("readonly", true); - this.dialog.template.DOMContainer.style.display = "flex"; - this.dialog.template.DOMContainer.firstChild.style.display = "flex"; - placeholder_list.getDOMNode().size = 5; + app.setAttribute("readonly", true); // Bind some handlers app.onchange = (node, widget) => @@ -476,18 +463,16 @@ export class et2_placeholder_snippet_select extends et2_placeholder_select */ _on_placeholder_select() { - let app = this.dialog.template.widgetContainer.getDOMWidgetById("app"); - let entry = this.dialog.template.widgetContainer.getDOMWidgetById("entry"); - let placeholder_list = this.dialog.template.widgetContainer.getDOMWidgetById("placeholder_list"); - let preview = this.dialog.template.widgetContainer.getDOMWidgetById("preview_placeholder"); - let preview_content = this.dialog.template.widgetContainer.getDOMWidgetById("preview_content"); + let entry = this.dialog.template.widgetContainer.getDOMWidgetById("entry"); + let placeholder_list = this.dialog.template.widgetContainer.getDOMWidgetById("placeholder_list"); + let preview_content = this.dialog.template.widgetContainer.getDOMWidgetById("preview_content"); - if(placeholder_list.get_value() && entry.get_value()) + if(placeholder_list.value && entry.get_value()) { // Show the selected placeholder replaced with value from the selected entry this.egw().json( 'EGroupware\\Api\\Etemplate\\Widget\\Placeholder::ajax_fill_placeholders', - [placeholder_list.get_value(), {app: "addressbook", id: entry.get_value()}], + [placeholder_list.value, {app: "addressbook", id: entry.get_value()}], function(_content) { if(!_content) @@ -507,7 +492,7 @@ export class et2_placeholder_snippet_select extends et2_placeholder_select } if(!entry.get_value()) { - entry.search.get(0).focus(); + entry._searchNode.focus(); } } diff --git a/api/templates/default/insert_merge_placeholder.xet b/api/templates/default/insert_merge_placeholder.xet index d776152745..f5c21e4f7d 100644 --- a/api/templates/default/insert_merge_placeholder.xet +++ b/api/templates/default/insert_merge_placeholder.xet @@ -10,17 +10,20 @@ +