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

[SSE][PE] Fix Bug 35041.

Browse source
This commit is contained in:
Julia Radzhabova 2017-06-29 12:15:01 +03:00
parent c0491e3181
commit 4d28a5dfed
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js
View file

@ -501,6 +501,12 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
} }
this.btnsCategory[2].setDisabled(null === margins); // Margins this.btnsCategory[2].setDisabled(null === margins); // Margins
var shapetype = props.asc_getType();
this.btnsCategory[3].setDisabled(shapetype=='line' || shapetype=='bentConnector2' || shapetype=='bentConnector3'
|| shapetype=='bentConnector4' || shapetype=='bentConnector5' || shapetype=='curvedConnector2'
|| shapetype=='curvedConnector3' || shapetype=='curvedConnector4' || shapetype=='curvedConnector5'
|| shapetype=='straightConnector1');
value = props.asc_getColumnNumber(); value = props.asc_getColumnNumber();
this.spnColumns.setValue((null !== value && undefined !== value) ? value : '', true); this.spnColumns.setValue((null !== value && undefined !== value) ? value : '', true);

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

@ -535,6 +535,12 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
} }
this.btnsCategory[2].setDisabled(null === margins); // Margins this.btnsCategory[2].setDisabled(null === margins); // Margins
var shapetype = shapeprops.asc_getType();
this.btnsCategory[3].setDisabled(shapetype=='line' || shapetype=='bentConnector2' || shapetype=='bentConnector3'
|| shapetype=='bentConnector4' || shapetype=='bentConnector5' || shapetype=='curvedConnector2'
|| shapetype=='curvedConnector3' || shapetype=='curvedConnector4' || shapetype=='curvedConnector5'
|| shapetype=='straightConnector1');
value = shapeprops.asc_getColumnNumber(); value = shapeprops.asc_getColumnNumber();
this.spnColumns.setValue((null !== value && undefined !== value) ? value : '', true); this.spnColumns.setValue((null !== value && undefined !== value) ? value : '', true);