From 89967336e225fd4e60d5b2c79bac8f47cc787db1 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 11 Jun 2021 13:47:59 +0200 Subject: [PATCH] removed app_base.js from egw.js requirement to not pull in etemplate, but had to move app to egw.js too --- api/js/jsapi/app_base.js | 14 -------------- api/js/jsapi/egw.js | 15 ++++++++++++++- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/api/js/jsapi/app_base.js b/api/js/jsapi/app_base.js index c245d4d5f8..a057975786 100644 --- a/api/js/jsapi/app_base.js +++ b/api/js/jsapi/app_base.js @@ -20,20 +20,6 @@ import {et2_nextmatch} from "../etemplate/et2_extension_nextmatch"; import {et2_favorites} from "../etemplate/et2_widget_favorites"; import {EgwApp} from "./egw_app"; -/** - * Object to collect instanciated appliction objects - * - * Attributes classes collects loaded application classes, - * which can get instanciated: - * - * app[appname] = new app.classes[appname](); - * - * On destruction only app[appname] gets deleted, app.classes[appname] need to be used again! - * - * @type object - */ -window.app = {classes: {}}; - /** * Common base class for application javascript * Each app should extend as needed. diff --git a/api/js/jsapi/egw.js b/api/js/jsapi/egw.js index c2753a6d99..f1fb4d4747 100644 --- a/api/js/jsapi/egw.js +++ b/api/js/jsapi/egw.js @@ -31,9 +31,22 @@ egw_inheritance; egw_message; egw_notification; - app_base; */ +/** + * Object to collect instantiated application objects + * + * Attributes classes collects loaded application classes, + * which can get instantiated: + * + * app[appname] = new app.classes[appname](); + * + * On destruction only app[appname] gets deleted, app.classes[appname] need to be used again! + * + * @type object + */ +window.app = {classes: {}}; + (function() { "use strict";