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

[PE] Fix bugs

Browse source
This commit is contained in:
Julia Radzhabova 2022-01-20 21:49:00 +03:00
parent 475d42e02f
commit 19960b2305
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/lib/util/define.js
View file

@ -922,7 +922,7 @@ define(function(){ 'use strict';
{group: 'menu-effect-group-emphasis', level: 'menu-effect-level-subtle', value: AscFormat.EMPHASIS_COMPLEMENTARY_COLOR_2, displayValue: this.textComplementaryColor2}, {group: 'menu-effect-group-emphasis', level: 'menu-effect-level-subtle', value: AscFormat.EMPHASIS_COMPLEMENTARY_COLOR_2, displayValue: this.textComplementaryColor2},
{group: 'menu-effect-group-emphasis', level: 'menu-effect-level-subtle', value: AscFormat.EMPHASIS_CONTRASTING_COLOR, displayValue: this.textContrastingColor}, {group: 'menu-effect-group-emphasis', level: 'menu-effect-level-subtle', value: AscFormat.EMPHASIS_CONTRASTING_COLOR, displayValue: this.textContrastingColor},
{group: 'menu-effect-group-emphasis', level: 'menu-effect-level-subtle', value: AscFormat.EMPHASIS_CONTRASTING_DARKEN, displayValue: this.textDarken}, {group: 'menu-effect-group-emphasis', level: 'menu-effect-level-subtle', value: AscFormat.EMPHASIS_CONTRASTING_DARKEN, displayValue: this.textDarken},
{group: 'menu-effect-group-emphasis', level: 'menu-effect-level-subtle', value: AscFormat.EMPHASIS_DESATURAT, displayValue: this.textDesaturate}, {group: 'menu-effect-group-emphasis', level: 'menu-effect-level-subtle', value: AscFormat.EMPHASIS_DESATURATE, displayValue: this.textDesaturate},
{group: 'menu-effect-group-emphasis', level: 'menu-effect-level-subtle', value: AscFormat.EMPHASIS_LIGHTEN, displayValue: this.textLighten}, {group: 'menu-effect-group-emphasis', level: 'menu-effect-level-subtle', value: AscFormat.EMPHASIS_LIGHTEN, displayValue: this.textLighten},
{group: 'menu-effect-group-emphasis', level: 'menu-effect-level-subtle', value: AscFormat.EMPHASIS_OBJECT_COLOR, displayValue: this.textObjectColor}, {group: 'menu-effect-group-emphasis', level: 'menu-effect-level-subtle', value: AscFormat.EMPHASIS_OBJECT_COLOR, displayValue: this.textObjectColor},
{group: 'menu-effect-group-emphasis', level: 'menu-effect-level-subtle', value: AscFormat.EMPHASIS_PULSE, displayValue: this.textPulse}, {group: 'menu-effect-group-emphasis', level: 'menu-effect-level-subtle', value: AscFormat.EMPHASIS_PULSE, displayValue: this.textPulse},

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

@ -521,7 +521,7 @@ define([
(effect.familyEffect) && this.btnParameters.menu.addItem({caption: '--'}); (effect.familyEffect) && this.btnParameters.menu.addItem({caption: '--'});
} else { } else {
this.btnParameters.menu.items.forEach(function (opt,index) { this.btnParameters.menu.items.forEach(function (opt,index) {
if(index<arrEffectOptions.length && opt.value == option) if(opt.toggleGroup == 'animateeffects' && opt.value == option)
selectedElement = opt; selectedElement = opt;
},this); },this);
} }
@ -535,12 +535,12 @@ define([
opt.checkable = true; opt.checkable = true;
opt.toggleGroup = 'animatesimilareffects' opt.toggleGroup = 'animatesimilareffects'
this.btnParameters.menu.addItem(opt); this.btnParameters.menu.addItem(opt);
(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(true);
}, this); }, this);
} }
else { else {
this.btnParameters.menu.items.forEach(function (opt,index) { this.btnParameters.menu.items.forEach(function (opt,index) {
if(index>=arrEffectOptions.length && opt.value == effectId) if(opt.toggleGroup == 'animatesimilareffects' && opt.value == effectId)
opt.setChecked(true); opt.setChecked(true);
}); });
} }