fix bug 32130

apps/presentationeditor/main/app/view/SlideSettings.js

@@ -577,7 +577,7 @@ define([
                 case Asc.c_oAscFill.FILL_TYPE_SOLID:
                     this._state.FillType = Asc.c_oAscFill.FILL_TYPE_SOLID;
                     if (!this._noApply) {
-                        var props = new CAscSlideProps();
+                        var props = new Asc.CAscSlideProps();
                         var fill = new CAscFill();
                         fill.put_type(Asc.c_oAscFill.FILL_TYPE_SOLID);
                         fill.put_fill( new CAscFillSolid());
@@ -589,7 +589,7 @@ define([
                 case Asc.c_oAscFill.FILL_TYPE_GRAD:
                     this._state.FillType = Asc.c_oAscFill.FILL_TYPE_GRAD;
                     if (!this._noApply) {
-                        var props = new CAscSlideProps();
+                        var props = new Asc.CAscSlideProps();
                         var fill = new CAscFill();
                         fill.put_type(Asc.c_oAscFill.FILL_TYPE_GRAD);
                         fill.put_fill( new CAscFillGrad());
@@ -621,7 +621,7 @@ define([
                 case Asc.c_oAscFill.FILL_TYPE_PATT:
                     this._state.FillType = Asc.c_oAscFill.FILL_TYPE_PATT;
                     if (!this._noApply) {
-                        var props = new CAscSlideProps();
+                        var props = new Asc.CAscSlideProps();
                         var fill = new CAscFill();
                         fill.put_type(Asc.c_oAscFill.FILL_TYPE_PATT);
                         fill.put_fill( new CAscFillHatch());
@@ -645,7 +645,7 @@ define([
                 case Asc.c_oAscFill.FILL_TYPE_NOFILL:
                     this._state.FillType = Asc.c_oAscFill.FILL_TYPE_NOFILL;
                     if (!this._noApply) {
-                        var props = new CAscSlideProps();
+                        var props = new Asc.CAscSlideProps();
                         var fill = new CAscFill();
                         fill.put_type(Asc.c_oAscFill.FILL_TYPE_NOFILL);
                         fill.put_fill(null);
@@ -662,7 +662,7 @@ define([
             this.SlideColor = {Value: 1, Color: color};
 
             if (this.api && !this._noApply) {
-                var props = new CAscSlideProps();
+                var props = new Asc.CAscSlideProps();
                 var fill = new CAscFill();
 
                 if (this.SlideColor.Color=='transparent') {
@@ -687,7 +687,7 @@ define([
         onPatternSelect: function(combo, record){
             if (this.api && !this._noApply) {
                 this.PatternFillType = record.get('type');
-                var props = new CAscSlideProps();
+                var props = new Asc.CAscSlideProps();
                 var fill = new CAscFill();
                 fill.put_type(Asc.c_oAscFill.FILL_TYPE_PATT);
                 fill.put_fill( new CAscFillHatch());
@@ -706,7 +706,7 @@ define([
             this.btnFGColor.setColor(color);
             this.FGColor = {Value: 1, Color: color};
             if (this.api && !this._noApply) {
-                var props = new CAscSlideProps();
+                var props = new Asc.CAscSlideProps();
                 var fill = new CAscFill();
                 fill.put_type(Asc.c_oAscFill.FILL_TYPE_PATT);
                 fill.put_fill( new CAscFillHatch());
@@ -725,7 +725,7 @@ define([
             this.btnBGColor.setColor(color);
             this.BGColor = {Value: 1, Color: color};
             if (this.api && !this._noApply) {
-                var props = new CAscSlideProps();
+                var props = new Asc.CAscSlideProps();
                 var fill = new CAscFill();
                 fill.put_type(Asc.c_oAscFill.FILL_TYPE_PATT);
                 fill.put_fill( new CAscFillHatch());
@@ -744,7 +744,7 @@ define([
             this.BlipFillType = record.value;
 
             if (this.api && this._fromTextureCmb !== true && this.OriginalFillType == Asc.c_oAscFill.FILL_TYPE_BLIP) {
-                var props = new CAscSlideProps();
+                var props = new Asc.CAscSlideProps();
                 var fill = new CAscFill();
                 fill.put_type(Asc.c_oAscFill.FILL_TYPE_BLIP);
                 fill.put_fill( new CAscFillBlip());
@@ -782,7 +782,7 @@ define([
             }
 
             if (this.api && !this._noApply) {
-                var props = new CAscSlideProps();
+                var props = new Asc.CAscSlideProps();
                 var fill = new CAscFill();
                 fill.put_type(Asc.c_oAscFill.FILL_TYPE_GRAD);
                 fill.put_fill( new CAscFillGrad());
@@ -819,7 +819,7 @@ define([
             (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) ? this.GradLinearDirectionType = rawData.type : this.GradRadialDirectionIdx = 0;
             if (this.api) {
                 if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) {
-                    var props = new CAscSlideProps();
+                    var props = new Asc.CAscSlideProps();
                     var fill = new CAscFill();
                     fill.put_type(Asc.c_oAscFill.FILL_TYPE_GRAD);
                     fill.put_fill( new CAscFillGrad());
@@ -841,7 +841,7 @@ define([
             this.sldrGradient.setColorValue(Common.Utils.String.format('#{0}', (typeof(color) == 'object') ? color.color : color));
 
             if (this.api && !this._noApply) {
-                var props = new CAscSlideProps();
+                var props = new Asc.CAscSlideProps();
                 var fill = new CAscFill();
                 fill.put_type(Asc.c_oAscFill.FILL_TYPE_GRAD);
                 fill.put_fill( new CAscFillGrad());
@@ -883,7 +883,7 @@ define([
 
         _gradientApplyFunc: function() {
             if (this._sliderChanged) {
-                var props = new CAscSlideProps();
+                var props = new Asc.CAscSlideProps();
                 var fill = new CAscFill();
                 fill.put_type(Asc.c_oAscFill.FILL_TYPE_GRAD);
                 fill.put_fill( new CAscFillGrad());
@@ -912,7 +912,7 @@ define([
                             var checkUrl = value.replace(/ /g, '');
                             if (!_.isEmpty(checkUrl)) {
                                 if (me.BlipFillType !== null) {
-                                    var props = new CAscSlideProps();
+                                    var props = new Asc.CAscSlideProps();
                                     var fill = new CAscFill();
                                     fill.put_type(Asc.c_oAscFill.FILL_TYPE_BLIP);
                                     fill.put_fill( new CAscFillBlip());
@@ -996,7 +996,7 @@ define([
             this._fromTextureCmb = false;
 
             if (this.api) {
-                var props = new CAscSlideProps();
+                var props = new Asc.CAscSlideProps();
                 var fill = new CAscFill();
                 fill.put_type(Asc.c_oAscFill.FILL_TYPE_BLIP);
                 fill.put_fill( new CAscFillBlip());
@@ -1057,8 +1057,8 @@ define([
                 this.fillEffectTypeCombo(type);
             this.Effect = type;
             if (this.api && !this._noApply) {
-                var props = new CAscSlideProps();
-                var timing = new Asc.Asc.CAscSlideProps();
+                var props = new Asc.CAscSlideProps();
+                var timing = new Asc.CAscSlideTiming();
                 timing.put_TransitionType(type);
                 timing.put_TransitionOption(this.EffectType);
                 props.put_timing(timing);
@@ -1070,8 +1070,8 @@ define([
         onEffectTypeSelect: function(combo, record) {
             this.EffectType = record.value;
             if (this.api && !this._noApply) {
-                var props = new CAscSlideProps();
-                var timing = new Asc.Asc.CAscSlideProps();
+                var props = new Asc.CAscSlideProps();
+                var timing = new Asc.CAscSlideTiming();
                 timing.put_TransitionType(this.Effect);
                 timing.put_TransitionOption(this.EffectType);
                 props.put_timing(timing);
@@ -1082,8 +1082,8 @@ define([
 
         onDurationChange: function(field, newValue, oldValue, eOpts){
             if (this.api && !this._noApply)   {
-                var props = new CAscSlideProps();
-                var timing = new Asc.Asc.CAscSlideProps();
+                var props = new Asc.CAscSlideProps();
+                var timing = new Asc.CAscSlideTiming();
                 timing.put_TransitionDuration(field.getNumberValue()*1000);
                 props.put_timing(timing);
                 this.api.SetSlideProps(props);
@@ -1093,8 +1093,8 @@ define([
 
         onDelayChange: function(field, newValue, oldValue, eOpts){
             if (this.api && !this._noApply)   {
-                var props = new CAscSlideProps();
-                var timing = new Asc.Asc.CAscSlideProps();
+                var props = new Asc.CAscSlideProps();
+                var timing = new Asc.CAscSlideTiming();
                 timing.put_SlideAdvanceDuration(field.getNumberValue()*1000);
                 props.put_timing(timing);
                 this.api.SetSlideProps(props);
@@ -1104,8 +1104,8 @@ define([
 
         onStartOnClickChange: function(field, newValue, oldValue, eOpts){
             if (this.api && !this._noApply)   {
-                var props = new CAscSlideProps();
-                var timing = new Asc.Asc.CAscSlideProps();
+                var props = new Asc.CAscSlideProps();
+                var timing = new Asc.CAscSlideTiming();
                 timing.put_SlideAdvanceOnMouseClick(field.getValue()=='checked');
                 props.put_timing(timing);
                 this.api.SetSlideProps(props);
@@ -1116,8 +1116,8 @@ define([
         onCheckDelayChange: function(field, newValue, oldValue, eOpts){
             this.numDelay.setDisabled(field.getValue()!=='checked');
             if (this.api && !this._noApply)   {
-                var props = new CAscSlideProps();
-                var timing = new Asc.Asc.CAscSlideProps();
+                var props = new Asc.CAscSlideProps();
+                var timing = new Asc.CAscSlideTiming();
                 timing.put_SlideAdvanceAfter(field.getValue()=='checked');
                 props.put_timing(timing);
                 this.api.SetSlideProps(props);