From d05770fe6b24612e8890c281d053d7362eefa056 Mon Sep 17 00:00:00 2001 From: OVSharova Date: Thu, 21 Oct 2021 18:06:24 +0300 Subject: [PATCH 1/7] Fix bug --- .../main/app/controller/Transitions.js | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/apps/presentationeditor/main/app/controller/Transitions.js b/apps/presentationeditor/main/app/controller/Transitions.js index 09a8a81a2..ec3d2bee5 100644 --- a/apps/presentationeditor/main/app/controller/Transitions.js +++ b/apps/presentationeditor/main/app/controller/Transitions.js @@ -76,6 +76,8 @@ define([ } }); + this._noApply = false; + }, onLaunch: function () { @@ -122,12 +124,12 @@ define([ }, onParameterClick: function (item) { - this.EffectType = item.value; + this._state.EffectType = item.value; if (this.api && !this._noApply) { var props = new Asc.CAscSlideProps(); var transition = new Asc.CAscSlideTransition(); - transition.put_TransitionType(this.Effect); - transition.put_TransitionOption(this.EffectType); + transition.put_TransitionType(this._state.Effect); + transition.put_TransitionOption(this._state.EffectType); props.put_transition(transition); this.api.SetSlideProps(props); } @@ -181,22 +183,24 @@ define([ onEffectSelect: function (combo, record) { var type = record.get('value'); - if (this.Effect !== type && - !((this.Effect === Asc.c_oAscSlideTransitionTypes.Wipe || this.Effect === Asc.c_oAscSlideTransitionTypes.UnCover || this.Effect === Asc.c_oAscSlideTransitionTypes.Cover)&& + 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); if (parameter) this.onParameterClick(parameter); } - this.Effect = type; + 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.EffectType); + transition.put_TransitionOption(this._state.EffectType); props.put_transition(transition); this.api.SetSlideProps(props); + + this._state.Effect = type; } }, From c1e5327d475f054461752fe495ebbd607d1cb187 Mon Sep 17 00:00:00 2001 From: OVSharova Date: Thu, 21 Oct 2021 20:49:55 +0300 Subject: [PATCH 2/7] Refactoring --- .../main/app/controller/Transitions.js | 25 +++++-------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/apps/presentationeditor/main/app/controller/Transitions.js b/apps/presentationeditor/main/app/controller/Transitions.js index ec3d2bee5..aef5b8d60 100644 --- a/apps/presentationeditor/main/app/controller/Transitions.js +++ b/apps/presentationeditor/main/app/controller/Transitions.js @@ -76,8 +76,6 @@ define([ } }); - this._noApply = false; - }, onLaunch: function () { @@ -125,7 +123,7 @@ define([ onParameterClick: function (item) { this._state.EffectType = item.value; - if (this.api && !this._noApply) { + if (this.api) { var props = new Asc.CAscSlideProps(); var transition = new Asc.CAscSlideTransition(); transition.put_TransitionType(this._state.Effect); @@ -136,7 +134,7 @@ define([ }, onDurationChange: function(field, newValue, oldValue, eOpts) { - if (this.api && !this._noApply) { + if (this.api) { var props = new Asc.CAscSlideProps(); var transition = new Asc.CAscSlideTransition(); transition.put_TransitionDuration(field.getNumberValue()*1000); @@ -146,7 +144,7 @@ define([ }, onStartOnClickChange: function(field, newValue, oldValue, eOpts) { - if (this.api && !this._noApply) { + if (this.api) { var props = new Asc.CAscSlideProps(); var transition = new Asc.CAscSlideTransition(); transition.put_SlideAdvanceOnMouseClick(field.getValue() == 'checked'); @@ -156,7 +154,7 @@ define([ }, onDelayChange: function(field, newValue, oldValue, eOpts) { - if (this.api && !this._noApply) { + if (this.api) { var props = new Asc.CAscSlideProps(); var transition = new Asc.CAscSlideTransition(); transition.put_SlideAdvanceDuration(field.getNumberValue()*1000); @@ -167,7 +165,7 @@ define([ onCheckDelayChange: function(field, newValue, oldValue, eOpts) { this.view.numDelay.setDisabled(field.getValue() !== 'checked'); - if (this.api && !this._noApply) { + if (this.api) { var props = new Asc.CAscSlideProps(); var transition = new Asc.CAscSlideTransition(); 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)&& (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); } - 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) { @@ -277,7 +265,6 @@ define([ setSettings: function () { var me = this.view; - if (this._state.Effect !== undefined) { var item = me.listEffects.store.findWhere({value: this._state.Effect}); me.listEffects.menuPicker.selectRecord(item ? item : me.listEffects.menuPicker.items[0]); From 1a7d36f4d2e835aee29ef2068a938aa29516cfc9 Mon Sep 17 00:00:00 2001 From: OVSharova Date: Fri, 22 Oct 2021 14:19:53 +0300 Subject: [PATCH 3/7] Refactoring --- apps/presentationeditor/main/app/view/Transitions.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/apps/presentationeditor/main/app/view/Transitions.js b/apps/presentationeditor/main/app/view/Transitions.js index 3751874af..38a89f616 100644 --- a/apps/presentationeditor/main/app/view/Transitions.js +++ b/apps/presentationeditor/main/app/view/Transitions.js @@ -393,12 +393,11 @@ define([ } var selectedElement; - _.each(this.btnParameters.menu.items, function (element, index) { - if (((index < minMax[0])||(index > minMax[1]))) - element.$el.css('display', 'none'); - else { - element.$el.css('display', ''); + _.each(this.btnParameters.menu.items, function (element, index) { + element.setVisible(((index >= minMax[0])&&(index <= minMax[1]))); + + if ((index >= minMax[0])&&(index <= minMax[1])) { if (value != undefined) { if (value == element.value) selectedElement = element; } From 3e582f9c31bc7200188bda64e3b7a48e6b2f4910 Mon Sep 17 00:00:00 2001 From: OVSharova Date: Fri, 22 Oct 2021 17:32:38 +0300 Subject: [PATCH 4/7] 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; }, From dcf9248b291710277b1e3a68216d8862083c31ac Mon Sep 17 00:00:00 2001 From: OVSharova Date: Fri, 22 Oct 2021 17:44:37 +0300 Subject: [PATCH 5/7] Fix bug --- apps/presentationeditor/main/app/controller/Transitions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/presentationeditor/main/app/controller/Transitions.js b/apps/presentationeditor/main/app/controller/Transitions.js index 1202d5cf8..89660d903 100644 --- a/apps/presentationeditor/main/app/controller/Transitions.js +++ b/apps/presentationeditor/main/app/controller/Transitions.js @@ -187,7 +187,7 @@ define([ var parameter = this.view.setMenuParameters(type); this._state.Effect = type; - if (parameter) + if (parameter!=undefined) this.onParameterClick(parameter); else this.onParameterClick(this._state.EffectType); From 03c11ac11028b81dba9030b4cbd17dbc93dadea6 Mon Sep 17 00:00:00 2001 From: OVSharova Date: Fri, 22 Oct 2021 18:46:18 +0300 Subject: [PATCH 6/7] Refactoring --- .../presentationeditor/main/app/controller/Transitions.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/apps/presentationeditor/main/app/controller/Transitions.js b/apps/presentationeditor/main/app/controller/Transitions.js index 89660d903..3b28840a3 100644 --- a/apps/presentationeditor/main/app/controller/Transitions.js +++ b/apps/presentationeditor/main/app/controller/Transitions.js @@ -180,17 +180,15 @@ define([ onEffectSelect: function (combo, record) { var type = record.get('value'); + var parameter = this._state.EffectType; 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); + parameter = this.view.setMenuParameters(type); this._state.Effect = type; - if (parameter!=undefined) - this.onParameterClick(parameter); - else - this.onParameterClick(this._state.EffectType); + this.onParameterClick(this._state.EffectType); }, onFocusObject: function(selectedObjects) { From a3e8192289d2dabe24a3822b4f9809f71715ff43 Mon Sep 17 00:00:00 2001 From: OVSharova Date: Fri, 22 Oct 2021 21:07:00 +0300 Subject: [PATCH 7/7] Fix bug --- apps/presentationeditor/main/app/controller/Transitions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/presentationeditor/main/app/controller/Transitions.js b/apps/presentationeditor/main/app/controller/Transitions.js index 3b28840a3..6b8efb3b0 100644 --- a/apps/presentationeditor/main/app/controller/Transitions.js +++ b/apps/presentationeditor/main/app/controller/Transitions.js @@ -188,7 +188,7 @@ define([ parameter = this.view.setMenuParameters(type); this._state.Effect = type; - this.onParameterClick(this._state.EffectType); + this.onParameterClick(parameter); }, onFocusObject: function(selectedObjects) {