From 418df1187ffb0f8a17396eec43c30c2af4e67c22 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 21 Mar 2022 15:18:46 +0300 Subject: [PATCH 1/2] [PE] Fix Bug 56140 --- apps/presentationeditor/main/app/controller/Animation.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/presentationeditor/main/app/controller/Animation.js b/apps/presentationeditor/main/app/controller/Animation.js index 8870ab28f..2cadc36a7 100644 --- a/apps/presentationeditor/main/app/controller/Animation.js +++ b/apps/presentationeditor/main/app/controller/Animation.js @@ -188,8 +188,6 @@ define([ }, 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); this.api.asc_AddAnimation(group, type, (parameter != undefined)?parameter:0, replace, preview); }, From 5618e7e590242c1449456648f549bbcae0d28e11 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 21 Mar 2022 18:21:08 +0300 Subject: [PATCH 2/2] Fix Bug 56147 --- apps/common/main/lib/component/InputField.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/apps/common/main/lib/component/InputField.js b/apps/common/main/lib/component/InputField.js index d8148a113..b3321058c 100644 --- a/apps/common/main/lib/component/InputField.js +++ b/apps/common/main/lib/component/InputField.js @@ -606,8 +606,12 @@ define([ this.hidePwd = true; } var me = this; + var prevstart = me._input[0].selectionStart, + prevend = me._input[0].selectionEnd; setTimeout(function () { me.focus(); + me._input[0].selectionStart = prevstart; + me._input[0].selectionEnd = prevend; }, 1); }, @@ -648,8 +652,12 @@ define([ this._btnElm.off('mouseup', this.passwordHide); this._btnElm.off('mouseout', this.passwordHide); var me = this; + var prevstart = me._input[0].selectionStart, + prevend = me._input[0].selectionEnd; setTimeout(function () { me.focus(); + me._input[0].selectionStart = prevstart; + me._input[0].selectionEnd = prevend; }, 1); } },