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

Fix bug

Browse source
This commit is contained in:
OVSharova 2022-01-20 19:17:18 +03:00
parent 45863f9a2d
commit 475d42e02f
1 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
apps/presentationeditor/main/app/view/Animation.js
View file

@ -520,14 +520,16 @@ define([
}, this); }, this);
(effect.familyEffect) && this.btnParameters.menu.addItem({caption: '--'}); (effect.familyEffect) && this.btnParameters.menu.addItem({caption: '--'});
} else { } else {
this.btnParameters.menu.items.forEach(function (opt) { this.btnParameters.menu.items.forEach(function (opt,index) {
(opt.value == option) && (selectedElement = opt); if(index<arrEffectOptions.length && opt.value == option)
}); selectedElement = opt;
},this);
} }
(selectedElement == undefined) && (selectedElement = this.btnParameters.menu.items[0]) (selectedElement == undefined) && (selectedElement = this.btnParameters.menu.items[0])
selectedElement.setChecked(true); selectedElement.setChecked(true);
} }
if (effect.familyEffect && this._familyEffect != effect.familyEffect) { if (effect.familyEffect){
if (this._familyEffect != effect.familyEffect) {
var effectsArray = Common.define.effectData.getSimilarEffectsArray(effectGroup, effect.familyEffect); var effectsArray = Common.define.effectData.getSimilarEffectsArray(effectGroup, effect.familyEffect);
effectsArray.forEach(function (opt) { effectsArray.forEach(function (opt) {
opt.checkable = true; opt.checkable = true;
@ -536,6 +538,14 @@ define([
(opt.value == effectId) && this.btnParameters.menu.items[this.btnParameters.menu.items.length - 1].setChecked(); (opt.value == effectId) && this.btnParameters.menu.items[this.btnParameters.menu.items.length - 1].setChecked();
}, this); }, this);
} }
else {
this.btnParameters.menu.items.forEach(function (opt,index) {
if(index>=arrEffectOptions.length && opt.value == effectId)
opt.setChecked(true);
});
}
}
this._effectId = effectId; this._effectId = effectId;
this._groupName = effectGroup; this._groupName = effectGroup;
this._familyEffect = effect.familyEffect; this._familyEffect = effect.familyEffect;