From 3e582f9c31bc7200188bda64e3b7a48e6b2f4910 Mon Sep 17 00:00:00 2001 From: OVSharova Date: Fri, 22 Oct 2021 17:32:38 +0300 Subject: [PATCH] Refactoring --- .../main/app/controller/Transitions.js | 17 +++++++++-------- .../main/app/view/Transitions.js | 12 +++++------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/apps/presentationeditor/main/app/controller/Transitions.js b/apps/presentationeditor/main/app/controller/Transitions.js index aef5b8d60..1202d5cf8 100644 --- a/apps/presentationeditor/main/app/controller/Transitions.js +++ b/apps/presentationeditor/main/app/controller/Transitions.js @@ -121,8 +121,8 @@ define([ } }, - onParameterClick: function (item) { - this._state.EffectType = item.value; + onParameterClick: function (value) { + this._state.EffectType = value; if (this.api) { var props = new Asc.CAscSlideProps(); var transition = new Asc.CAscSlideTransition(); @@ -183,13 +183,14 @@ define([ 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)&& - (type === Asc.c_oAscSlideTransitionTypes.Wipe || type === Asc.c_oAscSlideTransitionTypes.UnCover || type === Asc.c_oAscSlideTransitionTypes.Cover))) { - var parameter = this.view.setMenuParameters(type); - this._state.Effect = type; - if (parameter) - this.onParameterClick(parameter); - } + (type === Asc.c_oAscSlideTransitionTypes.Wipe || type === Asc.c_oAscSlideTransitionTypes.UnCover || type === Asc.c_oAscSlideTransitionTypes.Cover))) + var parameter = this.view.setMenuParameters(type); + this._state.Effect = type; + if (parameter) + this.onParameterClick(parameter); + else + this.onParameterClick(this._state.EffectType); }, onFocusObject: function(selectedObjects) { diff --git a/apps/presentationeditor/main/app/view/Transitions.js b/apps/presentationeditor/main/app/view/Transitions.js index 38a89f616..07a57cc83 100644 --- a/apps/presentationeditor/main/app/view/Transitions.js +++ b/apps/presentationeditor/main/app/view/Transitions.js @@ -70,12 +70,9 @@ define([ } 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.fireEvent('transit:parameters', [item]); + me.fireEvent('transit:parameters', [item.value]); }); } @@ -395,13 +392,14 @@ define([ var selectedElement; _.each(this.btnParameters.menu.items, function (element, index) { - element.setVisible(((index >= minMax[0])&&(index <= minMax[1]))); - if ((index >= minMax[0])&&(index <= minMax[1])) { + element.setVisible(true); if (value != undefined) { if (value == element.value) selectedElement = element; } } + else + element.setVisible(false); }); if (selectedElement == undefined) @@ -416,7 +414,7 @@ define([ this.btnPreview.setDisabled(effect === Asc.c_oAscSlideTransitionTypes.None); this.numDuration.setDisabled(effect === Asc.c_oAscSlideTransitionTypes.None); } - return selectedElement; + return (selectedElement)?selectedElement.value:-1; },