Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix change and apply gradient angle for shapes/textarts/slide/cell

Browse source
This commit is contained in:
Julia Radzhabova 2020-10-16 17:35:56 +03:00
parent 2d6f7630c2
commit 209382e0e0
8 changed files with 45 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/documenteditor/main/app/view/ShapeSettings.js
View file

@ -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);

12
apps/documenteditor/main/app/view/TextArtSettings.js
View file

@ -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);

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

@ -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);

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

@ -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);

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

@ -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);

6
apps/spreadsheeteditor/main/app/view/CellSettings.js
View file

@ -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);

12
apps/spreadsheeteditor/main/app/view/ShapeSettings.js
View file

@ -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);

12
apps/spreadsheeteditor/main/app/view/TextArtSettings.js
View file

@ -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);