From 98b3fa96328c28839e7920df6e7a9c37b21ef8fe Mon Sep 17 00:00:00 2001
From: djmaze <>
Date: Tue, 28 Dec 2021 17:13:15 +0100
Subject: [PATCH] v2.10.0
---
.../files/usr/local/include/application.ini | 2 +-
.eslintrc.js | 2 +-
README.md | 26 +++++++++----------
dev/Common/Selector.js | 4 +--
integrations/cloudron/DESCRIPTION.md | 2 +-
integrations/cloudron/Dockerfile | 2 +-
integrations/nextcloud/snappymail/VERSION | 2 +-
.../nextcloud/snappymail/appinfo/info.xml | 2 +-
integrations/virtualmin/snappymail.pl | 2 +-
package.json | 2 +-
release.php | 3 ---
11 files changed, 23 insertions(+), 26 deletions(-)
diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini
index 8db73a860..0ae76031c 100644
--- a/.docker/release/files/usr/local/include/application.ini
+++ b/.docker/release/files/usr/local/include/application.ini
@@ -289,5 +289,5 @@ dev_email = ""
dev_password = ""
[version]
-current = "2.9.6"
+current = "2.10.0"
saved = "Mon, 23 Aug 2021 07:55:13 +0000"
diff --git a/.eslintrc.js b/.eslintrc.js
index 4088884ec..5efeabffe 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -9,7 +9,7 @@ module.exports = {
env: {
node: true,
browser: true,
- es6: true
+ es2020: true
},
globals: {
// SnappyMail
diff --git a/README.md b/README.md
index 1c89b83b4..013ad4ca1 100644
--- a/README.md
+++ b/README.md
@@ -138,23 +138,23 @@ RainLoop 1.15 vs SnappyMail
|js/* |RainLoop |Snappy |
|--------------- |--------: |--------: |
-|admin.js |2.158.025 | 85.374 |
-|app.js |4.215.733 | 425.896 |
+|admin.js |2.158.025 | 86.169 |
+|app.js |4.215.733 | 424.944 |
|boot.js | 672.433 | 2.779 |
-|libs.js | 647.679 | 209.024 |
+|libs.js | 647.679 | 209.031 |
|polyfills.js | 325.908 | 0 |
|serviceworker.js | 0 | 285 |
-|TOTAL |8.019.778 | 723.358 |
+|TOTAL |8.019.778 | 723.208 |
|js/min/* |RainLoop |Snappy |RL gzip |SM gzip |RL brotli |SM brotli |
|--------------- |--------: |--------: |------: |------: |--------: |--------: |
-|admin.min.js | 255.514 | 42.994 | 73.899 | 13.759 | 60.674 | 12.257 |
-|app.min.js | 516.000 | 216.479 |140.430 | 65.691 |110.657 | 55.861 |
+|admin.min.js | 255.514 | 43.369 | 73.899 | 13.924 | 60.674 | 12.400 |
+|app.min.js | 516.000 | 215.368 |140.430 | 65.454 |110.657 | 55.697 |
|boot.min.js | 66.456 | 1.654 | 22.553 | 996 | 20.043 | 814 |
-|libs.min.js | 574.626 | 99.890 |177.280 | 36.443 |151.855 | 32.660 |
+|libs.min.js | 574.626 | 99.760 |177.280 | 36.443 |151.855 | 32.665 |
|polyfills.min.js | 32.608 | 0 | 11.315 | 0 | 10.072 | 0 |
-|TOTAL |1.445.204 | 361.017 |425.477 |116.889 |353.301 |101.592 |
-|TOTAL (no admin) |1.189.690 | 318.023 |351.061 |103.130 |292.627 | 89.335 |
+|TOTAL |1.445.204 | 360.151 |425.477 |116.817 |353.301 |101.576 |
+|TOTAL (no admin) |1.189.690 | 316.782 |351.061 |102.893 |292.627 | 89.176 |
For a user its around 70% smaller and faster than traditional RainLoop.
@@ -193,12 +193,12 @@ For a user its around 70% smaller and faster than traditional RainLoop.
|css/* |RainLoop |Snappy |RL gzip |SM gzip |SM brotli |
|------------ |-------: |------: |------: |------: |--------: |
-|app.css | 340.334 | 84.786 | 46.959 | 16.287 | 14.086 |
-|app.min.css | 274.791 | 68.596 | 39.618 | 14.406 | 12.791 |
+|app.css | 340.334 | 84.810 | 46.959 | 16.297 | 14.102 |
+|app.min.css | 274.791 | 68.619 | 39.618 | 14.424 | 12.796 |
|boot.css | | 1.326 | | 664 | 545 |
|boot.min.css | | 1.071 | | 590 | 474 |
-|admin.css | | 30.486 | | 6.873 | 5.959 |
-|admin.min.css | | 24.483 | | 6.223 | 5.465 |
+|admin.css | | 30.598 | | 6.900 | 5.983 |
+|admin.min.css | | 24.578 | | 6.248 | 5.492 |
### Squire vs CKEditor
diff --git a/dev/Common/Selector.js b/dev/Common/Selector.js
index f60d438ec..1876be3b0 100644
--- a/dev/Common/Selector.js
+++ b/dev/Common/Selector.js
@@ -288,7 +288,7 @@ export class Selector {
* @returns {boolean}
*/
autoSelect() {
- return !!(this.oCallbacks.AutoSelect || (()=>true))();
+ return !!(this.oCallbacks.AutoSelect || (()=>1))();
}
/**
@@ -329,7 +329,7 @@ export class Selector {
} else if (++i < listLen) {
result = list[i];
}
- result || (this.oCallbacks.UpOrDown || (()=>true))('ArrowUp' === sEventKey);
+ result || (this.oCallbacks.UpOrDown || (()=>0))('ArrowUp' === sEventKey);
} else if ('Home' === sEventKey) {
result = list[0];
} else if ('End' === sEventKey) {
diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md
index ffb490e1c..f79287bdd 100644
--- a/integrations/cloudron/DESCRIPTION.md
+++ b/integrations/cloudron/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages SnappyMail 2.9.6.
+This app packages SnappyMail 2.10.0.
SnappyMail is a simple, modern, lightweight & fast web-based email client.
diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile
index aaa9b755b..c70fb49bc 100644
--- a/integrations/cloudron/Dockerfile
+++ b/integrations/cloudron/Dockerfile
@@ -4,7 +4,7 @@ RUN mkdir -p /app/code
WORKDIR /app/code
# If you change the extraction below, be sure to test on scaleway
-VERSION=2.9.6
+VERSION=2.10.0
RUN wget https://github.com/the-djmaze/snappymail/releases/download/v${VERSION}/snappymail-${VERSION}.zip -O /tmp/snappymail.zip && \
unzip /tmp/snappymail.zip -d /app/code && \
rm /tmp/snappymail.zip && \
diff --git a/integrations/nextcloud/snappymail/VERSION b/integrations/nextcloud/snappymail/VERSION
index daf077f9e..f161b5d80 100755
--- a/integrations/nextcloud/snappymail/VERSION
+++ b/integrations/nextcloud/snappymail/VERSION
@@ -1 +1 @@
-2.9.6
\ No newline at end of file
+2.10.0
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml
index 251d64465..3444210ee 100644
--- a/integrations/nextcloud/snappymail/appinfo/info.xml
+++ b/integrations/nextcloud/snappymail/appinfo/info.xml
@@ -4,7 +4,7 @@
SnappyMail
SnappyMail Webmail
Simple, modern and fast web-based email client. After enabling in Nextcloud, go to Nextcloud admin panel, "Additionnal settings" and you will see a "SnappyMail webmail" section. There, click on the link to go to the SnappyMail admin panel. The default user/password is admin/12345. This version is based on SnappyMail 2.6.0 (2021-07).
- 2.9.6
+ 2.10.0
agpl
SnappyMail Team, Nextgen-Networks, Tab Fitts, Nathan Kinkade, Pierre-Alain Bandinelli
SnappyMail
diff --git a/integrations/virtualmin/snappymail.pl b/integrations/virtualmin/snappymail.pl
index c1e9ba101..0c2186c09 100644
--- a/integrations/virtualmin/snappymail.pl
+++ b/integrations/virtualmin/snappymail.pl
@@ -20,7 +20,7 @@ return "SnappyMail Webmail is a browser-based multilingual IMAP client with an a
# script_snappymail_versions()
sub script_snappymail_versions
{
-return ( "2.9.6" );
+return ( "2.10.0" );
}
sub script_snappymail_version_desc
diff --git a/package.json b/package.json
index 80335901e..e9b674278 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
"title": "SnappyMail",
"description": "Simple, modern & fast web-based email client",
"private": true,
- "version": "2.9.6",
+ "version": "2.10.0",
"homepage": "https://snappymail.eu",
"author": {
"name": "DJ Maze",
diff --git a/release.php b/release.php
index a394f7d2f..25cecc4d2 100755
--- a/release.php
+++ b/release.php
@@ -210,9 +210,6 @@ $tar->addFromString('data/VERSION', $package->version);
$zip->addFile('data/README.md');
$tar->addFile('data/README.md');
-//$zip->addFile('data/EMPTY');
-//$tar->addFile('data/EMPTY');
-
if ($options['aur']) {
$data = '