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

Merge pull request #1629 from ONLYOFFICE/fix/bugfix

Browse source 
[PE] Fix Bug 55958
This commit is contained in:
Julia Radzhabova 2022-03-16 12:10:05 +03:00 committed by GitHub
parent 789266d14a b02c7be9c8
commit bfec2495b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/common/main/lib/view/OpenDialog.js
View file

@ -521,7 +521,9 @@ define([
onCmbDelimiterSelect: function(combo, record){ onCmbDelimiterSelect: function(combo, record){
this.inputDelimiter.setVisible(record.value == -1); this.inputDelimiter.setVisible(record.value == -1);
(record.value == -1) && this.inputDelimiter.cmpEl.find('input').focus(); var me = this;
if (record.value == -1)
setTimeout(function(){me.inputDelimiter.focus();}, 10);
if (this.preview) if (this.preview)
this.updatePreview(); this.updatePreview();
}, },

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

@ -174,7 +174,7 @@ define([
handler : function(result, value) { handler : function(result, value) {
if (result == 'ok') { if (result == 'ok') {
if (me.api) { if (me.api) {
me.addNewEffect(value.activeEffect, value.activeGroupValue, value.activeGroup, replace); me.addNewEffect(value.activeEffect, value.activeGroupValue, value.activeGroup, replace, undefined, !Common.Utils.InternalSettings.get("pe-animation-no-preview"));
} }
} }
} }
@ -187,11 +187,11 @@ define([
this.addNewEffect(type, group, record.get('group'), false); this.addNewEffect(type, group, record.get('group'), false);
}, },
addNewEffect: function (type, group, groupName, replace, parametr) { addNewEffect: function (type, group, groupName, replace, parametr, preview) {
if (this._state.Effect == type && this._state.EffectGroup == group && replace) if (this._state.Effect == type && this._state.EffectGroup == group && replace)
parametr = this._state.EffectOption; 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, !Common.Utils.InternalSettings.get("pe-animation-no-preview")); this.api.asc_AddAnimation(group, type, (parameter != undefined)?parameter:0, replace, preview);
}, },
onDurationChange: function(before,combo, record, e) { onDurationChange: function(before,combo, record, e) {