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

Refactoring

Browse source
This commit is contained in:
OVSharova 2021-10-21 20:49:55 +03:00
parent d05770fe6b
commit c1e5327d47
1 changed files with 6 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -76,8 +76,6 @@ define([
} }
}); });
this._noApply = false;
}, },
onLaunch: function () { onLaunch: function () {
@ -125,7 +123,7 @@ define([
onParameterClick: function (item) { onParameterClick: function (item) {
this._state.EffectType = item.value; this._state.EffectType = item.value;
if (this.api && !this._noApply) { if (this.api) {
var props = new Asc.CAscSlideProps(); var props = new Asc.CAscSlideProps();
var transition = new Asc.CAscSlideTransition(); var transition = new Asc.CAscSlideTransition();
transition.put_TransitionType(this._state.Effect); transition.put_TransitionType(this._state.Effect);
@ -136,7 +134,7 @@ define([
}, },
onDurationChange: function(field, newValue, oldValue, eOpts) { onDurationChange: function(field, newValue, oldValue, eOpts) {
if (this.api && !this._noApply) { if (this.api) {
var props = new Asc.CAscSlideProps(); var props = new Asc.CAscSlideProps();
var transition = new Asc.CAscSlideTransition(); var transition = new Asc.CAscSlideTransition();
transition.put_TransitionDuration(field.getNumberValue()*1000); transition.put_TransitionDuration(field.getNumberValue()*1000);
@ -146,7 +144,7 @@ define([
}, },
onStartOnClickChange: function(field, newValue, oldValue, eOpts) { onStartOnClickChange: function(field, newValue, oldValue, eOpts) {
if (this.api && !this._noApply) { if (this.api) {
var props = new Asc.CAscSlideProps(); var props = new Asc.CAscSlideProps();
var transition = new Asc.CAscSlideTransition(); var transition = new Asc.CAscSlideTransition();
transition.put_SlideAdvanceOnMouseClick(field.getValue() == 'checked'); transition.put_SlideAdvanceOnMouseClick(field.getValue() == 'checked');
@ -156,7 +154,7 @@ define([
}, },
onDelayChange: function(field, newValue, oldValue, eOpts) { onDelayChange: function(field, newValue, oldValue, eOpts) {
if (this.api && !this._noApply) { if (this.api) {
var props = new Asc.CAscSlideProps(); var props = new Asc.CAscSlideProps();
var transition = new Asc.CAscSlideTransition(); var transition = new Asc.CAscSlideTransition();
transition.put_SlideAdvanceDuration(field.getNumberValue()*1000); transition.put_SlideAdvanceDuration(field.getNumberValue()*1000);
@ -167,7 +165,7 @@ define([
onCheckDelayChange: function(field, newValue, oldValue, eOpts) { onCheckDelayChange: function(field, newValue, oldValue, eOpts) {
this.view.numDelay.setDisabled(field.getValue() !== 'checked'); this.view.numDelay.setDisabled(field.getValue() !== 'checked');
if (this.api && !this._noApply) { if (this.api) {
var props = new Asc.CAscSlideProps(); var props = new Asc.CAscSlideProps();
var transition = new Asc.CAscSlideTransition(); var transition = new Asc.CAscSlideTransition();
transition.put_SlideAdvanceAfter(field.getValue() == 'checked'); transition.put_SlideAdvanceAfter(field.getValue() == 'checked');
@ -187,21 +185,11 @@ define([
!((this._state.Effect === Asc.c_oAscSlideTransitionTypes.Wipe || this._state.Effect === Asc.c_oAscSlideTransitionTypes.UnCover || this._state.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);
this._state.Effect = type;
if (parameter) if (parameter)
this.onParameterClick(parameter); this.onParameterClick(parameter);
} }
this._state.Effect = type;
if (this.api && !this._noApply) {
var props = new Asc.CAscSlideProps();
var transition = new Asc.CAscSlideTransition();
transition.put_TransitionType(type);
transition.put_TransitionOption(this._state.EffectType);
props.put_transition(transition);
this.api.SetSlideProps(props);
this._state.Effect = type;
}
}, },
onFocusObject: function(selectedObjects) { onFocusObject: function(selectedObjects) {
@ -277,7 +265,6 @@ define([
setSettings: function () { setSettings: function () {
var me = this.view; var me = this.view;
if (this._state.Effect !== undefined) { if (this._state.Effect !== undefined) {
var item = me.listEffects.store.findWhere({value: this._state.Effect}); var item = me.listEffects.store.findWhere({value: this._state.Effect});
me.listEffects.menuPicker.selectRecord(item ? item : me.listEffects.menuPicker.items[0]); me.listEffects.menuPicker.selectRecord(item ? item : me.listEffects.menuPicker.items[0]);