From fb6f1654c70acbe2a63ff293d63775889a91e5b4 Mon Sep 17 00:00:00 2001
From: nathan <nathangray.bsc+github@gmail.com>
Date: Tue, 11 Jul 2023 12:02:36 -0600
Subject: [PATCH] Api: return a Promise from htmlarea.doLoadingFinished() so
etemplate can wait for it to be initialized
---
api/js/etemplate/et2_widget_htmlarea.ts | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/api/js/etemplate/et2_widget_htmlarea.ts b/api/js/etemplate/et2_widget_htmlarea.ts
index e1432ae7a5..c8c91e4823 100644
--- a/api/js/etemplate/et2_widget_htmlarea.ts
+++ b/api/js/etemplate/et2_widget_htmlarea.ts
@@ -17,7 +17,7 @@
import {et2_editableWidget} from "./et2_core_editableWidget";
import {ClassWithAttributes} from "./et2_core_inheritance";
-import {WidgetConfig, et2_register_widget, et2_createWidget} from "./et2_core_widget";
+import {et2_createWidget, et2_register_widget, WidgetConfig} from "./et2_core_widget";
import {et2_IResizeable} from "./et2_core_interfaces";
import {et2_no_init} from "./et2_core_common";
import {egw} from "../jsapi/egw_global";
@@ -195,8 +195,7 @@ export class et2_htmlarea extends et2_editableWidget implements et2_IResizeable
doLoadingFinished()
{
super.doLoadingFinished();
- this.init_editor();
- return true;
+ return this.init_editor();
}
init_editor() {
@@ -315,6 +314,7 @@ export class et2_htmlarea extends et2_editableWidget implements et2_IResizeable
activeElement && activeElement.focus && activeElement.focus();
}
});
+ return this.tinymce;
}
/**