diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js index 20609da09..bcdcdd7b7 100644 --- a/apps/documenteditor/main/app/view/ShapeSettings.js +++ b/apps/documenteditor/main/app/view/ShapeSettings.js @@ -410,7 +410,7 @@ define([ this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls')); else this.btnDirection.setIconCls(''); - this.numGradientAngle.setValue(this.GradLinearDirectionType); + this.numGradientAngle.setValue(this.GradLinearDirectionType, true); this.numGradientAngle.setDisabled(this._locked); } else if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_PATH) { this.mnuDirectionPicker.store.reset(this._viewDataRadial); @@ -421,7 +421,7 @@ define([ this.btnDirection.setIconCls('item-gradient ' + this._viewDataRadial[this.GradRadialDirectionIdx].iconcls); else this.btnDirection.setIconCls(''); - this.numGradientAngle.setValue(0); + this.numGradientAngle.setValue(0, true); this.numGradientAngle.setDisabled(true); } @@ -463,7 +463,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) { - this.numGradientAngle.setValue(rawData.type); + this.numGradientAngle.setValue(rawData.type, true); var props = new Asc.asc_CShapeProperty(); var fill = new Asc.asc_CShapeFill(); @@ -941,10 +941,10 @@ define([ this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls')); else this.btnDirection.setIconCls(''); - this.numGradientAngle.setValue(value); + this.numGradientAngle.setValue(value, true); } } else - this.numGradientAngle.setValue(0); + this.numGradientAngle.setValue(0, true); var me = this; var colors = fill.get_colors(), @@ -1945,7 +1945,7 @@ define([ }, onGradientAngleChange: function(field, newValue, oldValue, eOpts) { - if (this.api) { + if (this.api && !this._noApply) { var props = new Asc.asc_CShapeProperty(); var fill = new Asc.asc_CShapeFill(); fill.put_type(Asc.c_oAscFill.FILL_TYPE_GRAD); diff --git a/apps/documenteditor/main/app/view/TextArtSettings.js b/apps/documenteditor/main/app/view/TextArtSettings.js index 6101caa8f..868ebc5a9 100644 --- a/apps/documenteditor/main/app/view/TextArtSettings.js +++ b/apps/documenteditor/main/app/view/TextArtSettings.js @@ -275,7 +275,7 @@ define([ this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls')); else this.btnDirection.setIconCls(''); - this.numGradientAngle.setValue(this.GradLinearDirectionType); + this.numGradientAngle.setValue(this.GradLinearDirectionType, true); this.numGradientAngle.setDisabled(this._locked); } else if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_PATH) { this.mnuDirectionPicker.store.reset(this._viewDataRadial); @@ -286,7 +286,7 @@ define([ this.btnDirection.setIconCls('item-gradient ' + this._viewDataRadial[this.GradRadialDirectionIdx].iconcls); else this.btnDirection.setIconCls(''); - this.numGradientAngle.setValue(0); + this.numGradientAngle.setValue(0, true); this.numGradientAngle.setDisabled(true); } @@ -329,7 +329,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) { - this.numGradientAngle.setValue(rawData.type); + this.numGradientAngle.setValue(rawData.type, true); var props = new Asc.asc_TextArtProperties(); var fill = new Asc.asc_CShapeFill(); @@ -615,10 +615,10 @@ define([ this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls')); else this.btnDirection.setIconCls(''); - this.numGradientAngle.setValue(value); + this.numGradientAngle.setValue(value, true); } } else - this.numGradientAngle.setValue(0); + this.numGradientAngle.setValue(0, true); var me = this; var colors = fill.get_colors(), @@ -1280,7 +1280,7 @@ define([ }, onGradientAngleChange: function(field, newValue, oldValue, eOpts) { - if (this.api) { + if (this.api && !this._noApply) { var props = new Asc.asc_TextArtProperties(); var fill = new Asc.asc_CShapeFill(); fill.put_type(Asc.c_oAscFill.FILL_TYPE_GRAD); diff --git a/apps/presentationeditor/main/app/view/ShapeSettings.js b/apps/presentationeditor/main/app/view/ShapeSettings.js index ebb78460c..588415bc5 100644 --- a/apps/presentationeditor/main/app/view/ShapeSettings.js +++ b/apps/presentationeditor/main/app/view/ShapeSettings.js @@ -394,7 +394,7 @@ define([ this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls')); else this.btnDirection.setIconCls(''); - this.numGradientAngle.setValue(this.GradLinearDirectionType); + this.numGradientAngle.setValue(this.GradLinearDirectionType, true); this.numGradientAngle.setDisabled(this._locked); } else if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_PATH) { this.mnuDirectionPicker.store.reset(this._viewDataRadial); @@ -405,7 +405,7 @@ define([ this.btnDirection.setIconCls('item-gradient ' + this._viewDataRadial[this.GradRadialDirectionIdx].iconcls); else this.btnDirection.setIconCls(''); - this.numGradientAngle.setValue(0); + this.numGradientAngle.setValue(0, true); this.numGradientAngle.setDisabled(true); } @@ -447,7 +447,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) { - this.numGradientAngle.setValue(rawData.type); + this.numGradientAngle.setValue(rawData.type, true); var props = new Asc.asc_CShapeProperty(); var fill = new Asc.asc_CShapeFill(); @@ -855,10 +855,10 @@ define([ this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls')); else this.btnDirection.setIconCls(''); - this.numGradientAngle.setValue(value); + this.numGradientAngle.setValue(value, true); } } else - this.numGradientAngle.setValue(0); + this.numGradientAngle.setValue(0, true); var me = this; var colors = fill.get_colors(), @@ -1817,7 +1817,7 @@ define([ }, onGradientAngleChange: function(field, newValue, oldValue, eOpts) { - if (this.api) { + if (this.api && !this._noApply) { var props = new Asc.asc_CShapeProperty(); var fill = new Asc.asc_CShapeFill(); fill.put_type(Asc.c_oAscFill.FILL_TYPE_GRAD); diff --git a/apps/presentationeditor/main/app/view/SlideSettings.js b/apps/presentationeditor/main/app/view/SlideSettings.js index a54f9956e..f09266959 100644 --- a/apps/presentationeditor/main/app/view/SlideSettings.js +++ b/apps/presentationeditor/main/app/view/SlideSettings.js @@ -496,7 +496,7 @@ define([ this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls')); else this.btnDirection.setIconCls(''); - this.numGradientAngle.setValue(this.GradLinearDirectionType); + this.numGradientAngle.setValue(this.GradLinearDirectionType, true); this.numGradientAngle.setDisabled(this._locked.background); } else if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_PATH) { this.mnuDirectionPicker.store.reset(this._viewDataRadial); @@ -507,7 +507,7 @@ define([ this.btnDirection.setIconCls('item-gradient ' + this._viewDataRadial[this.GradRadialDirectionIdx].iconcls); else this.btnDirection.setIconCls(''); - this.numGradientAngle.setValue(0); + this.numGradientAngle.setValue(0, true); this.numGradientAngle.setDisabled(true); } @@ -549,7 +549,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) { - this.numGradientAngle.setValue(rawData.type); + this.numGradientAngle.setValue(rawData.type, true); var props = new Asc.CAscSlideProps(); var fill = new Asc.asc_CShapeFill(); @@ -1303,10 +1303,10 @@ define([ this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls')); else this.btnDirection.setIconCls(''); - this.numGradientAngle.setValue(value); + this.numGradientAngle.setValue(value, true); } } else - this.numGradientAngle.setValue(0); + this.numGradientAngle.setValue(0, true); var me = this; var colors = fill.get_colors(), @@ -1627,7 +1627,7 @@ define([ }, onGradientAngleChange: function(field, newValue, oldValue, eOpts) { - if (this.api) { + if (this.api && !this._noApply) { var props = new Asc.CAscSlideProps(); var fill = new Asc.asc_CShapeFill(); fill.put_type(Asc.c_oAscFill.FILL_TYPE_GRAD); diff --git a/apps/presentationeditor/main/app/view/TextArtSettings.js b/apps/presentationeditor/main/app/view/TextArtSettings.js index 30dc06a29..b48aba029 100644 --- a/apps/presentationeditor/main/app/view/TextArtSettings.js +++ b/apps/presentationeditor/main/app/view/TextArtSettings.js @@ -395,7 +395,7 @@ define([ this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls')); else this.btnDirection.setIconCls(''); - this.numGradientAngle.setValue(this.GradLinearDirectionType); + this.numGradientAngle.setValue(this.GradLinearDirectionType, true); this.numGradientAngle.setDisabled(this._locked); } else if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_PATH) { this.mnuDirectionPicker.store.reset(this._viewDataRadial); @@ -406,7 +406,7 @@ define([ this.btnDirection.setIconCls('item-gradient ' + this._viewDataRadial[this.GradRadialDirectionIdx].iconcls); else this.btnDirection.setIconCls(''); - this.numGradientAngle.setValue(0); + this.numGradientAngle.setValue(0, true); this.numGradientAngle.setDisabled(true); } @@ -449,7 +449,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) { - this.numGradientAngle.setValue(rawData.type); + this.numGradientAngle.setValue(rawData.type, true); var props = new Asc.asc_TextArtProperties(); var fill = new Asc.asc_CShapeFill(); @@ -809,10 +809,10 @@ define([ this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls')); else this.btnDirection.setIconCls(''); - this.numGradientAngle.setValue(value); + this.numGradientAngle.setValue(value, true); } } else - this.numGradientAngle.setValue(0); + this.numGradientAngle.setValue(0, true); var me = this; var colors = fill.get_colors(), @@ -1711,7 +1711,7 @@ define([ }, onGradientAngleChange: function(field, newValue, oldValue, eOpts) { - if (this.api) { + if (this.api && !this._noApply) { var props = new Asc.asc_TextArtProperties(); var fill = new Asc.asc_CShapeFill(); fill.put_type(Asc.c_oAscFill.FILL_TYPE_GRAD); diff --git a/apps/spreadsheeteditor/main/app/view/CellSettings.js b/apps/spreadsheeteditor/main/app/view/CellSettings.js index a260cbb7f..ff7b560a6 100644 --- a/apps/spreadsheeteditor/main/app/view/CellSettings.js +++ b/apps/spreadsheeteditor/main/app/view/CellSettings.js @@ -663,7 +663,7 @@ define([ this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls')); else this.btnDirection.setIconCls(''); - this.numGradientAngle.setValue(value); + this.numGradientAngle.setValue(value, true); } } @@ -1049,7 +1049,7 @@ define([ this.btnDirection.setIconCls('item-gradient ' + rawData.iconcls); this.GradLinearDirectionType = rawData.type; - this.numGradientAngle.setValue(rawData.type); + this.numGradientAngle.setValue(rawData.type, true); if (this.api) { if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) { @@ -1103,7 +1103,7 @@ define([ }, onGradientAngleChange: function(field, newValue, oldValue, eOpts) { - if (this.api) { + if (this.api && !this._noApply) { if (this.gradient == null) { this.gradient = new Asc.asc_CGradientFill(); this.gradient.asc_setType(this.GradFillType); diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js index aa6e73d5e..7f83ec623 100644 --- a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js @@ -406,7 +406,7 @@ define([ this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls')); else this.btnDirection.setIconCls(''); - this.numGradientAngle.setValue(this.GradLinearDirectionType); + this.numGradientAngle.setValue(this.GradLinearDirectionType, true); this.numGradientAngle.setDisabled(this._locked); } else if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_PATH) { this.mnuDirectionPicker.store.reset(this._viewDataRadial); @@ -417,7 +417,7 @@ define([ this.btnDirection.setIconCls('item-gradient ' + this._viewDataRadial[this.GradRadialDirectionIdx].iconcls); else this.btnDirection.setIconCls(''); - this.numGradientAngle.setValue(0); + this.numGradientAngle.setValue(0, true); this.numGradientAngle.setDisabled(true); } @@ -460,7 +460,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) { - this.numGradientAngle.setValue(rawData.type); + this.numGradientAngle.setValue(rawData.type, true); var props = new Asc.asc_CShapeProperty(); var fill = new Asc.asc_CShapeFill(); @@ -879,10 +879,10 @@ define([ this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls')); else this.btnDirection.setIconCls(''); - this.numGradientAngle.setValue(value); + this.numGradientAngle.setValue(value, true); } } else - this.numGradientAngle.setValue(0); + this.numGradientAngle.setValue(0, true); var me = this; var colors = fill.asc_getColors(), @@ -1848,7 +1848,7 @@ define([ }, onGradientAngleChange: function(field, newValue, oldValue, eOpts) { - if (this.api) { + if (this.api && !this._noApply) { var props = new Asc.asc_CShapeProperty(); var fill = new Asc.asc_CShapeFill(); fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_GRAD); diff --git a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js index 6ce4ee7a4..907394fb2 100644 --- a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js +++ b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js @@ -396,7 +396,7 @@ define([ this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls')); else this.btnDirection.setIconCls(''); - this.numGradientAngle.setValue(this.GradLinearDirectionType); + this.numGradientAngle.setValue(this.GradLinearDirectionType, true); this.numGradientAngle.setDisabled(this._locked); } else if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_PATH) { this.mnuDirectionPicker.store.reset(this._viewDataRadial); @@ -407,7 +407,7 @@ define([ this.btnDirection.setIconCls('item-gradient ' + this._viewDataRadial[this.GradRadialDirectionIdx].iconcls); else this.btnDirection.setIconCls(''); - this.numGradientAngle.setValue(0); + this.numGradientAngle.setValue(0, true); this.numGradientAngle.setDisabled(true); } @@ -450,7 +450,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) { - this.numGradientAngle.setValue(rawData.type); + this.numGradientAngle.setValue(rawData.type, true); var props = new Asc.asc_TextArtProperties(); var fill = new Asc.asc_CShapeFill(); @@ -813,10 +813,10 @@ define([ this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls')); else this.btnDirection.setIconCls(''); - this.numGradientAngle.setValue(value); + this.numGradientAngle.setValue(value, true); } } else - this.numGradientAngle.setValue(0); + this.numGradientAngle.setValue(0, true); var me = this; var colors = fill.asc_getColors(), @@ -1714,7 +1714,7 @@ define([ }, onGradientAngleChange: function(field, newValue, oldValue, eOpts) { - if (this.api) { + if (this.api && !this._noApply) { var props = new Asc.asc_TextArtProperties(); var fill = new Asc.asc_CShapeFill(); fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_GRAD);