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

Merge pull request #1642 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2022-03-21 20:27:27 +03:00 committed by GitHub
parent d6948d4445 5618e7e590
commit ad26e55ef1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -606,8 +606,12 @@ define([
this.hidePwd = true; this.hidePwd = true;
} }
var me = this; var me = this;
var prevstart = me._input[0].selectionStart,
prevend = me._input[0].selectionEnd;
setTimeout(function () { setTimeout(function () {
me.focus(); me.focus();
me._input[0].selectionStart = prevstart;
me._input[0].selectionEnd = prevend;
}, 1); }, 1);
}, },
@ -648,8 +652,12 @@ define([
this._btnElm.off('mouseup', this.passwordHide); this._btnElm.off('mouseup', this.passwordHide);
this._btnElm.off('mouseout', this.passwordHide); this._btnElm.off('mouseout', this.passwordHide);
var me = this; var me = this;
var prevstart = me._input[0].selectionStart,
prevend = me._input[0].selectionEnd;
setTimeout(function () { setTimeout(function () {
me.focus(); me.focus();
me._input[0].selectionStart = prevstart;
me._input[0].selectionEnd = prevend;
}, 1); }, 1);
} }
}, },

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

@ -188,8 +188,6 @@ define([
}, },
addNewEffect: function (type, group, groupName, replace, parametr, preview) { addNewEffect: function (type, group, groupName, replace, parametr, preview) {
if (this._state.Effect == type && this._state.EffectGroup == group && replace)
parametr = this._state.EffectOption;
var parameter = this.view.setMenuParameters(type, groupName, parametr); var parameter = this.view.setMenuParameters(type, groupName, parametr);
this.api.asc_AddAnimation(group, type, (parameter != undefined)?parameter:0, replace, preview); this.api.asc_AddAnimation(group, type, (parameter != undefined)?parameter:0, replace, preview);
}, },