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 2021-10-21 18:06:24 +03:00
parent 4b1a3e30a0
commit d05770fe6b
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
apps/presentationeditor/main/app/controller/Transitions.js
View file

@ -76,6 +76,8 @@ define([
} }
}); });
this._noApply = false;
}, },
onLaunch: function () { onLaunch: function () {
@ -122,12 +124,12 @@ define([
}, },
onParameterClick: function (item) { onParameterClick: function (item) {
this.EffectType = item.value; this._state.EffectType = item.value;
if (this.api && !this._noApply) { if (this.api && !this._noApply) {
var props = new Asc.CAscSlideProps(); var props = new Asc.CAscSlideProps();
var transition = new Asc.CAscSlideTransition(); var transition = new Asc.CAscSlideTransition();
transition.put_TransitionType(this.Effect); transition.put_TransitionType(this._state.Effect);
transition.put_TransitionOption(this.EffectType); transition.put_TransitionOption(this._state.EffectType);
props.put_transition(transition); props.put_transition(transition);
this.api.SetSlideProps(props); this.api.SetSlideProps(props);
} }
@ -181,22 +183,24 @@ define([
onEffectSelect: function (combo, record) { onEffectSelect: function (combo, record) {
var type = record.get('value'); var type = record.get('value');
if (this.Effect !== type && if (this._state.Effect !== type &&
!((this.Effect === Asc.c_oAscSlideTransitionTypes.Wipe || this.Effect === Asc.c_oAscSlideTransitionTypes.UnCover || this.Effect === Asc.c_oAscSlideTransitionTypes.Cover)&& !((this._state.Effect === Asc.c_oAscSlideTransitionTypes.Wipe || this._state.Effect === Asc.c_oAscSlideTransitionTypes.UnCover || this._state.Effect === Asc.c_oAscSlideTransitionTypes.Cover)&&
(type === Asc.c_oAscSlideTransitionTypes.Wipe || type === Asc.c_oAscSlideTransitionTypes.UnCover || type === Asc.c_oAscSlideTransitionTypes.Cover))) { (type === Asc.c_oAscSlideTransitionTypes.Wipe || type === Asc.c_oAscSlideTransitionTypes.UnCover || type === Asc.c_oAscSlideTransitionTypes.Cover))) {
var parameter = this.view.setMenuParameters(type); var parameter = this.view.setMenuParameters(type);
if (parameter) if (parameter)
this.onParameterClick(parameter); this.onParameterClick(parameter);
} }
this.Effect = type; this._state.Effect = type;
if (this.api && !this._noApply) { if (this.api && !this._noApply) {
var props = new Asc.CAscSlideProps(); var props = new Asc.CAscSlideProps();
var transition = new Asc.CAscSlideTransition(); var transition = new Asc.CAscSlideTransition();
transition.put_TransitionType(type); transition.put_TransitionType(type);
transition.put_TransitionOption(this.EffectType); transition.put_TransitionOption(this._state.EffectType);
props.put_transition(transition); props.put_transition(transition);
this.api.SetSlideProps(props); this.api.SetSlideProps(props);
this._state.Effect = type;
} }
}, },