Refactoring
This commit is contained in:
parent
dcf9248b29
commit
03c11ac110
|
@ -180,17 +180,15 @@ define([
|
||||||
|
|
||||||
onEffectSelect: function (combo, record) {
|
onEffectSelect: function (combo, record) {
|
||||||
var type = record.get('value');
|
var type = record.get('value');
|
||||||
|
var parameter = this._state.EffectType;
|
||||||
|
|
||||||
if (this._state.Effect !== type &&
|
if (this._state.Effect !== type &&
|
||||||
!((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);
|
parameter = this.view.setMenuParameters(type);
|
||||||
|
|
||||||
this._state.Effect = type;
|
this._state.Effect = type;
|
||||||
if (parameter!=undefined)
|
this.onParameterClick(this._state.EffectType);
|
||||||
this.onParameterClick(parameter);
|
|
||||||
else
|
|
||||||
this.onParameterClick(this._state.EffectType);
|
|
||||||
},
|
},
|
||||||
|
|
||||||
onFocusObject: function(selectedObjects) {
|
onFocusObject: function(selectedObjects) {
|
||||||
|
|
Loading…
Reference in a new issue