Merge branch 'extjs-app-webmail#255' into dev

Author: ThorstenSuckow

.babelrc

@@ -0,0 +1,12 @@
+{
+  "sourceType": "script",
+  "presets": [
+    [
+      "@babel/preset-env",
+      {
+        "useBuiltIns": "entry",
+        "corejs": "3.22"
+      }
+    ]
+  ]
+}

.deloreanrc.json

@@ -0,0 +1,14 @@
+{
+    "map" : [
+      "sencha.classpath",
+      "sencha.overrides",
+      "classpath",
+      "overrides"
+    ],
+    "toolkits": [
+      "modern", "classic"
+    ],
+    "builds": [
+      "desktop", "shared"
+    ]
+}

.gitignore

@@ -4,3 +4,5 @@
 /node_modules/
 *.env
 /.extjs-link.conf.json
+/.deloreanbuild/
+/package.json.delorean

classic/src/view/mail/message/editor/HtmlEditor.js

@@ -1,7 +1,7 @@
 /**
  * conjoon
  * extjs-app-webmail
- * Copyright (C) 2019-2021 Thorsten Suckow-Homberg https://github.com/conjoon/extjs-app-webmail
+ * Copyright (C) 2019-2022 Thorsten Suckow-Homberg https://github.com/conjoon/extjs-app-webmail
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
@@ -107,12 +107,12 @@ Ext.define("conjoon.cn_mail.view.mail.message.editor.HtmlEditor", {
 
         // Destroying the component during initialization cancels initialization.
         if (me.destroying || me.destroyed) {
-            return me.callParent(arguments);
+            return me.superclass.initFrameDoc.apply(me, arguments);
         }
 
         me.editorHtmlTemplateTxt = await me.loadMarkup();
 
-        return me.callParent(arguments);
+        return me.superclass.initFrameDoc.apply(me, arguments);
     },
 
 

classic/src/view/mail/message/grid/feature/PreviewTextLazyLoad.js

@@ -46,9 +46,16 @@ Ext.define("conjoon.cn_mail.view.mail.message.grid.feature.PreviewTextLazyLoad",
         "l8",
         "conjoon.cn_mail.data.mail.message.CompoundKey",
         "coon.core.data.pageMap.PageMapUtil",
-        "coon.core.data.pageMap.RecordPosition"
+        "coon.core.data.pageMap.RecordPosition",
+        "coon.core.data.request.Configurator"
     ],
 
+    statics: {
+        required: {
+            requestConfigurator: "coon.core.data.request.Configurator"
+        }
+    },
+
     /**
      * @type {Object} pendingLazies
      * @private
@@ -59,6 +66,11 @@ Ext.define("conjoon.cn_mail.view.mail.message.grid.feature.PreviewTextLazyLoad",
      * @private
      */
 
+    /**
+     * @type {coon.core.data.request.Configurator} requestConfigurator
+     * @private
+     */
+
 
     /**
      * Inits this plugin.
@@ -447,16 +459,32 @@ Ext.define("conjoon.cn_mail.view.mail.message.grid.feature.PreviewTextLazyLoad",
             store = grid.getStore(),
             proxy = store.getProxy();
 
-        Ext.Ajax.request({
+        Ext.Ajax.request(me.requestConfigurator.configure(
+
+            me.getDefaultRequestCfg({
+                url,
+                idsToLoad,
+                options: proxy.getDefaultParameters("ListMessageItem.options")
+            })
+
+
+        )).then(me.processLoadedPreviewText.bind(me));
+    },
+
+
+    /**
+     * @private
+     */
+    getDefaultRequestCfg ({url, idsToLoad, options}) {
+        return {
             method: "get",
             url: url,
-            headers: proxy.headers,
             params: {
                 attributes: "previewText",
-                options: proxy.getDefaultParameters("ListMessageItem.options"),
+                options: options,
                 filter: JSON.stringify([{"property": "id", "operator": "in", "value": idsToLoad}])
             }
-        }).then(me.processLoadedPreviewText.bind(me));
+        };
     }
 
-});
+});

classic/src/view/mail/message/reader/MessageViewIframe.js

@@ -1,7 +1,7 @@
 /**
  * conjoon
  * extjs-app-webmail
- * Copyright (C) 2019-2021 Thorsten Suckow-Homberg https://github.com/conjoon/extjs-app-webmail
+ * Copyright (C) 2019-2022 Thorsten Suckow-Homberg https://github.com/conjoon/extjs-app-webmail
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
@@ -93,7 +93,7 @@ Ext.define("conjoon.cn_mail.view.mail.message.reader.MessageViewIframe", {
         me.publishState("imagesAllowed", me.imagesAllowed);
 
         if (!value) {
-            return me.callParent([value]);
+            return me.superclass.setSrcDoc.apply(me, [value]);
         }
 
         const
@@ -105,9 +105,12 @@ Ext.define("conjoon.cn_mail.view.mail.message.reader.MessageViewIframe", {
             ),
             tpl = await coon.core.Template.load(tplPath);
 
-        value = tpl.render({theme: themeConfig ? themeConfig : {}, reader: {body: value, imagesAllowed: me.imagesAllowed}});
+        value = tpl.render({
+            theme: themeConfig ? themeConfig : {},
+            reader: {body: value, imagesAllowed: me.imagesAllowed}
+        });
 
-        return me.callParent([value]);
+        return me.superclass.setSrcDoc.apply(me, [value]);
     },