From b022fe573a6c9855ab88e627626fa2c2c809b231 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 8 Jun 2021 15:18:12 +0200
Subject: [PATCH 1/2] Fix character count in form textareas

---
 www/form/inner.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/form/inner.js b/www/form/inner.js
index 9d4f87b79..d5d62b8f0 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -959,7 +959,7 @@ define([
                     evOnChange.fire();
                 }, 500);
 
-                $text.on('change keypress', function () {
+                $text.on('change keypress keyup keydown', function () {
                     setTimeout(updateChar);
                     evChange();
                 });

From 360204df30947d83cd27904056c1c12b749c74ae Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 8 Jun 2021 15:42:20 +0200
Subject: [PATCH 2/2] Fix character count when restoring form data

---
 www/form/inner.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/www/form/inner.js b/www/form/inner.js
index d5d62b8f0..f3c880afc 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -968,7 +968,10 @@ define([
                 return {
                     tag: tag,
                     getValue: function () { return $text.val().slice(0, opts.maxLength); },
-                    setValue: function (val) { $text.val(val); },
+                    setValue: function (val) {
+                        $text.val(val);
+                        updateChar();
+                    },
                     edit: function (cb, tmp) {
                         var v = Util.clone(opts);
                         return editTextOptions(v, setCursorGetter, cb, tmp);