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-22 17:32:38 +03:00
parent 1a7d36f4d2
commit 3e582f9c31
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -121,8 +121,8 @@ define([
} }
}, },
onParameterClick: function (item) { onParameterClick: function (value) {
this._state.EffectType = item.value; this._state.EffectType = value;
if (this.api) { if (this.api) {
var props = new Asc.CAscSlideProps(); var props = new Asc.CAscSlideProps();
var transition = new Asc.CAscSlideTransition(); var transition = new Asc.CAscSlideTransition();
@ -183,13 +183,14 @@ define([
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); var parameter = this.view.setMenuParameters(type);
this._state.Effect = type; this._state.Effect = type;
if (parameter) if (parameter)
this.onParameterClick(parameter); this.onParameterClick(parameter);
} else
this.onParameterClick(this._state.EffectType);
}, },
onFocusObject: function(selectedObjects) { onFocusObject: function(selectedObjects) {

12
apps/presentationeditor/main/app/view/Transitions.js
View file

@ -70,12 +70,9 @@ define([
} }
if (me.btnParameters) { if (me.btnParameters) {
me.btnParameters.on('click', function (e) {
me.fireEvent('transit:parameters', ['current']);
});
me.btnParameters.menu.on('item:click', function (menu, item, e) { me.btnParameters.menu.on('item:click', function (menu, item, e) {
me.fireEvent('transit:parameters', [item]); me.fireEvent('transit:parameters', [item.value]);
}); });
} }
@ -395,13 +392,14 @@ define([
var selectedElement; var selectedElement;
_.each(this.btnParameters.menu.items, function (element, index) { _.each(this.btnParameters.menu.items, function (element, index) {
element.setVisible(((index >= minMax[0])&&(index <= minMax[1])));
if ((index >= minMax[0])&&(index <= minMax[1])) { if ((index >= minMax[0])&&(index <= minMax[1])) {
element.setVisible(true);
if (value != undefined) { if (value != undefined) {
if (value == element.value) selectedElement = element; if (value == element.value) selectedElement = element;
} }
} }
else
element.setVisible(false);
}); });
if (selectedElement == undefined) if (selectedElement == undefined)
@ -416,7 +414,7 @@ define([
this.btnPreview.setDisabled(effect === Asc.c_oAscSlideTransitionTypes.None); this.btnPreview.setDisabled(effect === Asc.c_oAscSlideTransitionTypes.None);
this.numDuration.setDisabled(effect === Asc.c_oAscSlideTransitionTypes.None); this.numDuration.setDisabled(effect === Asc.c_oAscSlideTransitionTypes.None);
} }
return selectedElement; return (selectedElement)?selectedElement.value:-1;
}, },