[MERGE] Forward port of 12.0 to saas-12.2 up to 3b1d00acda9358108

closes odoo/odoo#34732

Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>

3 files changed, 37 insertions, 45 deletions

diff --git a/addons/web/i18n/km.po b/addons/web/i18n/km.po
index ad4e16ada6e..5fadab9d02f 100644
--- a/addons/web/i18n/km.po
+++ b/addons/web/i18n/km.po
@@ -620,7 +620,7 @@ msgstr ""
 #. module: web
 #: model:ir.model,name:web.model_base
 msgid "Base"
-msgstr ""
+msgstr "មូលដ្ឋាន"
 
 #. module: web
 #. openerp-web
@@ -656,7 +656,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/colorpicker.xml:35
 #, python-format
 msgid "Blue"
-msgstr ""
+msgstr "ខៀវ"
 
 #. module: web
 #. openerp-web
@@ -698,7 +698,7 @@ msgstr ""
 #: code:addons/web/static/src/js/views/calendar/calendar_view.js:22
 #, python-format
 msgid "Calendar"
-msgstr ""
+msgstr "ប្រតិទិន្ន"
 
 #. module: web
 #. openerp-web
@@ -745,7 +745,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:178
 #, python-format
 msgid "Change Password"
-msgstr ""
+msgstr "ប្ដូរពាក្យសំងាត់"
 
 #. module: web
 #. openerp-web
@@ -1181,7 +1181,7 @@ msgstr ""
 #. module: web
 #: model:ir.model.fields,field_description:web.field_report_layout__view_id
 msgid "Document Template"
-msgstr ""
+msgstr "គំរូបឯកសារ"
 
 #. module: web
 #. openerp-web
@@ -1623,7 +1623,7 @@ msgstr ""
 #. module: web
 #: model:ir.model,name:web.model_ir_http
 msgid "HTTP Routing"
-msgstr ""
+msgstr "HTTP ជុំវិញ"
 
 #. module: web
 #. openerp-web
@@ -1959,7 +1959,7 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:web.external_layout_standard
 #: model_terms:ir.ui.view,arch_db:web.login_layout
 msgid "Logo"
-msgstr ""
+msgstr "រូបសញ្ញា"
 
 #. module: web
 #. openerp-web
@@ -2138,7 +2138,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:1470
 #, python-format
 msgid "Name:"
-msgstr ""
+msgstr "ឈ្មោះ"
 
 #. module: web
 #. openerp-web
@@ -2384,7 +2384,7 @@ msgstr ""
 #: code:addons/web/static/src/js/fields/basic_fields.js:2052
 #, python-format
 msgid "Open"
-msgstr ""
+msgstr "បើក"
 
 #. module: web
 #. openerp-web
@@ -2465,7 +2465,7 @@ msgstr ""
 #. module: web
 #: model_terms:ir.ui.view,arch_db:web.login
 msgid "Password"
-msgstr ""
+msgstr "លេខសំងាត់"
 
 #. module: web
 #: model_terms:ir.ui.view,arch_db:web.external_layout_standard
@@ -2931,7 +2931,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:1006
 #, python-format
 msgid "Select"
-msgstr ""
+msgstr "ជ្រើសរើស"
 
 #. module: web
 #: model_terms:ir.ui.view,arch_db:web.login
diff --git a/addons/web/static/lib/jSignature/jSignatureCustom.js b/addons/web/static/lib/jSignature/jSignatureCustom.js
index ae51103da3d..6ccd2af79a3 100644
--- a/addons/web/static/lib/jSignature/jSignatureCustom.js
+++ b/addons/web/static/lib/jSignature/jSignatureCustom.js
@@ -760,7 +760,7 @@ function jSignatureClass(parent, options, instanceExtensions) {
     // these, when enabled, will hover above the sig area. Hence we append them to DOM before canvas.
     this.$controlbarUpper = (function(){
         var controlbarstyle = 'padding:0 !important; margin:0 !important;'+
-            'width: 100% !important; height: 0 !important; -ms-touch-action: none;'+
+            'width: 100% !important; height: 0 !important; -ms-touch-action: none; touch-action: none;'+
             'margin-top:-1em !important; margin-bottom:1em !important;';
         return $('<div style="'+controlbarstyle+'"></div>').appendTo($parent);
     })();
@@ -771,7 +771,7 @@ function jSignatureClass(parent, options, instanceExtensions) {
 
     this.$controlbarLower = (function(){
         var controlbarstyle = 'padding:0 !important; margin:0 !important;'+
-            'width: 100% !important; height: 0 !important; -ms-touch-action: none;'+
+            'width: 100% !important; height: 0 !important; -ms-touch-action: none; touch-action: none;'+
             'margin-top:-1.5em !important; margin-bottom:1.5em !important; position: relative;';
         return $('<div style="'+controlbarstyle+'"></div>').appendTo($parent);
     })();
@@ -876,7 +876,7 @@ function jSignatureClass(parent, options, instanceExtensions) {
             $canvas.bind('mouseup.'+apinamespace, drawEndHandler);
             $canvas.bind('mousedown.'+apinamespace, drawStartHandler);
         } else {
-            canvas.ontouchstart = function(e) {
+            canvas.addEventListener('touchstart', function(e) {
                 canvas.onmousedown = canvas.onmouseup = canvas.onmousemove = undef;
 
                 this.fatFingerCompensation = (
@@ -886,19 +886,19 @@ function jSignatureClass(parent, options, instanceExtensions) {
 
                 drawStartHandler(e);
 
-                canvas.ontouchend = drawEndHandler;
-                canvas.ontouchstart = drawStartHandler;
-                canvas.ontouchmove = drawMoveHandler;
-            };
-            canvas.onmousedown = function(e) {
+                canvas.addEventListener('touchend', drawEndHandler);
+                canvas.addEventListener('touchstart', drawStartHandler);
+                canvas.addEventListener('touchmove', drawMoveHandler);
+            });
+            canvas.addEventListener('mousedown', function(e) {
                 canvas.ontouchstart = canvas.ontouchend = canvas.ontouchmove = undef;
 
                 drawStartHandler(e);
 
-                canvas.onmousedown = drawStartHandler;
-                canvas.onmouseup = drawEndHandler;
-                canvas.onmousemove = drawMoveHandler;
-            }
+                canvas.addEventListener('mousedown', drawStartHandler);
+                canvas.addEventListener('mouseup', drawEndHandler);
+                canvas.addEventListener('mousemove', drawMoveHandler);
+            });
             if (window.navigator.msPointerEnabled) {
                 canvas.onmspointerdown = drawStartHandler;
                 canvas.onmspointerup = drawEndHandler;
@@ -1084,28 +1084,16 @@ jSignatureClass.prototype.initializeCanvas = function(settings) {
         settings.width = '100%';
     }
 
-    $canvas.css(
-        'margin'
-        , 0
-    ).css(
-        'padding'
-        , 0
-    ).css(
-        'border'
-        , 'none'
-    ).css(
-        'height'
-        , settings.height === 'ratio' || !settings.height ? 1 : settings.height.toString(10)
-    ).css(
-        'width'
-        , settings.width === 'ratio' || !settings.width ? 1 : settings.width.toString(10)
-    ).css(
-        '-ms-touch-action'
-        , 'none'
-    ).css(
-        'background-color',
-        settings['background-color']
-    );
+    $canvas.css({
+        'margin': 0,
+        'padding': 0,
+        'border': 'none',
+        'height': settings.height === 'ratio' || !settings.height ? 1 : settings.height.toString(10),
+        'width': settings.width === 'ratio' || !settings.width ? 1 : settings.width.toString(10),
+        '-ms-touch-action': 'none',
+        'touch-action': 'none',
+        'background-color': settings['background-color'],
+    });
 
     $canvas.appendTo(this.$parent);
 
diff --git a/addons/web/views/database_manager.html b/addons/web/views/database_manager.html
index d39a77ef4e7..4649366dd61 100644
--- a/addons/web/views/database_manager.html
+++ b/addons/web/views/database_manager.html
@@ -41,6 +41,10 @@
                 });
                 // close modal on submit
                 $('.modal').on('submit', 'form', function (ev) {
+                    var form = $(this).closest('form')[0];
+                    if (form && form.checkValidity && !form.checkValidity()) {
+                        return;
+                    }
                     var modal = $(this).parentsUntil('body', '.modal');
                     if (modal.hasClass('o_database_backup')) {
                         $(modal).modal('hide');