Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/develop' into feature/word-formulas

Browse source
This commit is contained in:
SergeyLuzyanin 2018-12-03 12:35:22 +03:00
parent 65a85bed70 c3ef04f0b8
commit 8d23258063
5 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/common/main/lib/component/InputField.js
View file

@ -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();
}

5
apps/common/main/lib/component/MaskedField.js
View file

@ -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();

7
apps/common/main/lib/component/MetricSpinner.js
View file

@ -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();
}

5
apps/documenteditor/main/app/view/TableOfContentsSettings.js
View file

@ -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();
}

2
apps/presentationeditor/main/app/controller/Main.js
View file

@ -945,7 +945,7 @@ define([
var commentsController = this.getApplication().getController('Common.Controllers.Comments');
if (commentsController) {
commentsController.setMode(this.appOptions);
commentsController.setConfig({config: this.editorConfig}, this.api);
commentsController.setConfig({config: this.editorConfig, sdkviewname: '#id_main_parent'}, this.api);
}
/** coauthoring end **/
}