From c8dc98041da8b612d7ebf82d3af5bd33566646ae Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 29 Jun 2017 12:15:01 +0300 Subject: [PATCH] [SSE][PE] Fix Bug 35041. --- .../main/app/view/ShapeSettingsAdvanced.js | 6 ++++++ .../main/app/view/ShapeSettingsAdvanced.js | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js index d4ac4aaef..a49e48575 100644 --- a/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js +++ b/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js @@ -501,6 +501,12 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem } 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(); this.spnColumns.setValue((null !== value && undefined !== value) ? value : '', true); diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js b/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js index bcda24275..640458a70 100644 --- a/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js +++ b/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js @@ -535,6 +535,12 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp } 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(); this.spnColumns.setValue((null !== value && undefined !== value) ? value : '', true);