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

[PE] Fix multiple animations

Browse source
This commit is contained in:
Julia Radzhabova 2022-01-21 16:28:57 +03:00
parent 21a9d01568
commit d94b41692c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -354,12 +354,12 @@ define([
if (!item.get('isCustom')) { // remove custom effect from list if not-custom is selected if (!item.get('isCustom')) { // remove custom effect from list if not-custom is selected
var rec = store.findWhere({isCustom: true}); var rec = store.findWhere({isCustom: true});
forceFill = !!rec; forceFill = !!rec;
store.remove(rec); rec && store.remove(rec);
} }
if (this._state.Effect!==AscFormat.ANIM_PRESET_MULTIPLE) { // remove "multiple" item if one effect is selected if (this._state.Effect!==AscFormat.ANIM_PRESET_MULTIPLE) { // remove "multiple" item if one effect is selected
var rec = fieldStore.findWhere({value: AscFormat.ANIM_PRESET_MULTIPLE}); var rec = fieldStore.findWhere({value: AscFormat.ANIM_PRESET_MULTIPLE});
forceFill = forceFill || !!rec; forceFill = forceFill || !!rec;
fieldStore.remove(rec); rec && fieldStore.remove(rec);
} }
view.listEffects.selectRecord(item); view.listEffects.selectRecord(item);
view.listEffects.fillComboView(item, true, forceFill); view.listEffects.fillComboView(item, true, forceFill);
@ -368,7 +368,7 @@ define([
store.remove(store.findWhere({isCustom: true})); // remove custom effects store.remove(store.findWhere({isCustom: true})); // remove custom effects
if (this._state.Effect==AscFormat.ANIM_PRESET_MULTIPLE) { // add and select "multiple" item if (this._state.Effect==AscFormat.ANIM_PRESET_MULTIPLE) { // add and select "multiple" item
view.listEffects.fillComboView(store.at(0), false, true); view.listEffects.fillComboView(store.at(0), false, true);
fieldStore.remove(fieldStore.at(fieldStore.length-1)); fieldStore.reset(fieldStore.slice(0, fieldStore.length-1));
view.listEffects.fieldPicker.selectRecord(fieldStore.add(new Common.UI.DataViewModel({ view.listEffects.fieldPicker.selectRecord(fieldStore.add(new Common.UI.DataViewModel({
group: 'none', group: 'none',
value: AscFormat.ANIM_PRESET_MULTIPLE, value: AscFormat.ANIM_PRESET_MULTIPLE,