From 864ebf4d7b8cc641603abf6239c4c30459701fb3 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Fri, 30 Nov 2018 17:04:47 +0300
Subject: [PATCH] Fix Bug 39893
---
apps/common/main/lib/component/InputField.js | 4 +---
apps/common/main/lib/component/MaskedField.js | 5 +----
apps/common/main/lib/component/MetricSpinner.js | 7 +------
.../main/app/view/TableOfContentsSettings.js | 5 +----
4 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/apps/common/main/lib/component/InputField.js b/apps/common/main/lib/component/InputField.js
index 00fc916a6..24e5e6d40 100644
--- a/apps/common/main/lib/component/InputField.js
+++ b/apps/common/main/lib/component/InputField.js
@@ -228,9 +228,7 @@ define([
if (this.options.maskExp && !_.isEmpty(this.options.maskExp.source)){
var charCode = String.fromCharCode(e.which);
- if(!this.options.maskExp.test(charCode) && !e.ctrlKey && e.keyCode !== Common.UI.Keys.DELETE && e.keyCode !== Common.UI.Keys.BACKSPACE &&
- e.keyCode !== Common.UI.Keys.LEFT && e.keyCode !== Common.UI.Keys.RIGHT && e.keyCode !== Common.UI.Keys.HOME &&
- e.keyCode !== Common.UI.Keys.END && e.keyCode !== Common.UI.Keys.ESC && e.keyCode !== Common.UI.Keys.INSERT && e.keyCode !== Common.UI.Keys.RETURN){
+ if(!this.options.maskExp.test(charCode) && !e.ctrlKey && e.keyCode !== Common.UI.Keys.RETURN){
e.preventDefault();
e.stopPropagation();
}
diff --git a/apps/common/main/lib/component/MaskedField.js b/apps/common/main/lib/component/MaskedField.js
index 640687c14..b92617c1f 100644
--- a/apps/common/main/lib/component/MaskedField.js
+++ b/apps/common/main/lib/component/MaskedField.js
@@ -54,10 +54,7 @@ define([
el.attr('maxlength', me.options.maxLength);
el.on('keypress', function(e) {
var charCode = String.fromCharCode(e.which);
- if(!me.options.maskExp.test(charCode) && !e.ctrlKey && e.keyCode !== Common.UI.Keys.DELETE && e.keyCode !== Common.UI.Keys.BACKSPACE &&
- e.keyCode !== Common.UI.Keys.LEFT && e.keyCode !== Common.UI.Keys.RIGHT && e.keyCode !== Common.UI.Keys.HOME &&
- e.keyCode !== Common.UI.Keys.END && e.keyCode !== Common.UI.Keys.ESC && e.keyCode !== Common.UI.Keys.INSERT &&
- e.keyCode !== Common.UI.Keys.TAB /* || el.val().length>=me.options.maxLength*/){
+ if(!me.options.maskExp.test(charCode) && !e.ctrlKey){
if (e.keyCode==Common.UI.Keys.RETURN) me.trigger('changed', me, el.val());
e.preventDefault();
e.stopPropagation();
diff --git a/apps/common/main/lib/component/MetricSpinner.js b/apps/common/main/lib/component/MetricSpinner.js
index 354689eaf..0c011e338 100644
--- a/apps/common/main/lib/component/MetricSpinner.js
+++ b/apps/common/main/lib/component/MetricSpinner.js
@@ -374,12 +374,7 @@ define([
if (charCode=='.' || charCode==',') {
e.preventDefault();
e.stopPropagation();
- } else if(this.options.maskExp && !this.options.maskExp.test(charCode) && !e.ctrlKey &&
- e.keyCode !== Common.UI.Keys.DELETE && e.keyCode !== Common.UI.Keys.BACKSPACE &&
- e.keyCode !== Common.UI.Keys.LEFT && e.keyCode !== Common.UI.Keys.RIGHT &&
- e.keyCode !== Common.UI.Keys.HOME && e.keyCode !== Common.UI.Keys.END &&
- e.keyCode !== Common.UI.Keys.ESC && e.keyCode !== Common.UI.Keys.RETURN &&
- e.keyCode !== Common.UI.Keys.INSERT && e.keyCode !== Common.UI.Keys.TAB){
+ } else if(this.options.maskExp && !this.options.maskExp.test(charCode) && !e.ctrlKey && e.keyCode !== Common.UI.Keys.RETURN ){
e.preventDefault();
e.stopPropagation();
}
diff --git a/apps/documenteditor/main/app/view/TableOfContentsSettings.js b/apps/documenteditor/main/app/view/TableOfContentsSettings.js
index 672cd112e..86c788322 100644
--- a/apps/documenteditor/main/app/view/TableOfContentsSettings.js
+++ b/apps/documenteditor/main/app/view/TableOfContentsSettings.js
@@ -594,10 +594,7 @@ define([
me = this;
input.on('keypress', function(e) {
var charCode = String.fromCharCode(e.which);
- if(!/[1-9]/.test(charCode) && !e.ctrlKey && e.keyCode !== Common.UI.Keys.DELETE && e.keyCode !== Common.UI.Keys.BACKSPACE &&
- e.keyCode !== Common.UI.Keys.LEFT && e.keyCode !== Common.UI.Keys.RIGHT && e.keyCode !== Common.UI.Keys.HOME &&
- e.keyCode !== Common.UI.Keys.END && e.keyCode !== Common.UI.Keys.ESC && e.keyCode !== Common.UI.Keys.INSERT &&
- e.keyCode !== Common.UI.Keys.TAB){
+ if(!/[1-9]/.test(charCode) && !e.ctrlKey){
e.preventDefault();
e.stopPropagation();
}