diff --git a/apps/common/main/lib/view/OpenDialog.js b/apps/common/main/lib/view/OpenDialog.js index 1a1681619..fff4bba47 100644 --- a/apps/common/main/lib/view/OpenDialog.js +++ b/apps/common/main/lib/view/OpenDialog.js @@ -521,7 +521,9 @@ define([ onCmbDelimiterSelect: function(combo, record){ 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) this.updatePreview(); }, diff --git a/apps/presentationeditor/main/app/controller/Animation.js b/apps/presentationeditor/main/app/controller/Animation.js index 4b54fdf21..a7e656c77 100644 --- a/apps/presentationeditor/main/app/controller/Animation.js +++ b/apps/presentationeditor/main/app/controller/Animation.js @@ -174,7 +174,7 @@ define([ handler : function(result, value) { if (result == 'ok') { 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); }, - 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) parametr = this._state.EffectOption; 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) {