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

Fix disabling rotation for smart arts/images/charts

Browse source
This commit is contained in:
Julia Radzhabova 2021-11-19 22:24:55 +03:00
parent 2fe8250093
commit e1b7a107ca
6 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/documenteditor/main/app/template/ShapeSettings.template
View file

@ -147,12 +147,12 @@
<div class="separator horizontal"></div> <div class="separator horizontal"></div>
</td> </td>
</tr> </tr>
<tr class="shape-only shape-rotation"> <tr class="shape-rotation">
<td class="padding-small"> <td class="padding-small">
<label class="header"><%= scope.textRotation %></label> <label class="header"><%= scope.textRotation %></label>
</td> </td>
</tr> </tr>
<tr class="shape-only shape-rotation"> <tr class="shape-rotation">
<td> <td>
<table cols="2" style="width: 100%;"> <table cols="2" style="width: 100%;">
<tr> <tr>

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

@ -819,8 +819,8 @@ define([
this._noApply = true; this._noApply = true;
this.disableControls(this._locked, !shapeprops.get_CanFill()); this.disableControls(this._locked, !shapeprops.get_CanFill());
this.hideShapeOnlySettings(shapeprops.get_FromChart() || shapeprops.get_FromImage()); this.hideShapeOnlySettings(shapeprops.get_FromChart() || !!shapeprops.get_FromImage());
this.hideRotationSettings(shapeprops.get_FromSmartArt()); this.hideRotationSettings(shapeprops.get_FromChart() || !!shapeprops.get_FromImage() || shapeprops.get_FromSmartArt());
var hidechangetype = shapeprops.get_FromChart() || shapeprops.get_FromSmartArt() || shapetype=='line' || shapetype=='bentConnector2' || shapetype=='bentConnector3' var hidechangetype = shapeprops.get_FromChart() || shapeprops.get_FromSmartArt() || shapetype=='line' || shapetype=='bentConnector2' || shapetype=='bentConnector3'
|| shapetype=='bentConnector4' || shapetype=='bentConnector5' || shapetype=='curvedConnector2' || shapetype=='bentConnector4' || shapetype=='bentConnector5' || shapetype=='curvedConnector2'
@ -1216,7 +1216,7 @@ define([
this._noApply = false; this._noApply = false;
} }
this.hideNoFormSettings(control_props); this.hideNoFormSettings(control_props);
this.ShapeOnlySeparator.toggleClass('hidden', (control_props || this._state.HideShapeOnlySettings || this._state.HideRotationSettings)==true); this.ShapeOnlySeparator.toggleClass('hidden', (control_props || this._state.HideShapeOnlySettings || this._state.HideRotationSettings)===true);
}, },
btnDirectionRedraw: function(slider, gradientColorsStr) { btnDirectionRedraw: function(slider, gradientColorsStr) {

6
apps/presentationeditor/main/app/template/ShapeSettings.template
View file

@ -142,17 +142,17 @@
</div> </div>
</td> </td>
</tr> </tr>
<tr class="shape-only shape-rotation"> <tr class="shape-rotation">
<td class="padding-small"> <td class="padding-small">
<div class="separator horizontal"></div> <div class="separator horizontal"></div>
</td> </td>
</tr> </tr>
<tr class="shape-only shape-rotation"> <tr class="shape-rotation">
<td class="padding-small"> <td class="padding-small">
<label class="header"><%= scope.textRotation %></label> <label class="header"><%= scope.textRotation %></label>
</td> </td>
</tr> </tr>
<tr class="shape-only shape-rotation"> <tr class="shape-rotation">
<td> <td>
<table cols="2" style="width: 100%;"> <table cols="2" style="width: 100%;">
<tr> <tr>

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

@ -765,8 +765,8 @@ define([
var shapetype = props.asc_getType(); var shapetype = props.asc_getType();
this.disableControls(this._locked==true, props.get_CanFill() !== true); this.disableControls(this._locked==true, props.get_CanFill() !== true);
this.hideShapeOnlySettings(props.get_FromChart() || props.get_FromImage()); this.hideShapeOnlySettings(props.get_FromChart() || !!props.get_FromImage());
this.hideRotationSettings(props.get_FromSmartArt()); this.hideRotationSettings(props.get_FromChart() || !!props.get_FromImage() || props.get_FromSmartArt());
var hidechangetype = props.get_FromChart() || props.get_FromSmartArt() || shapetype=='line' || shapetype=='bentConnector2' || shapetype=='bentConnector3' var hidechangetype = props.get_FromChart() || props.get_FromSmartArt() || shapetype=='line' || shapetype=='bentConnector2' || shapetype=='bentConnector3'
|| shapetype=='bentConnector4' || shapetype=='bentConnector5' || shapetype=='curvedConnector2' || shapetype=='bentConnector4' || shapetype=='bentConnector5' || shapetype=='curvedConnector2'

6
apps/spreadsheeteditor/main/app/template/ShapeSettings.template
View file

@ -142,17 +142,17 @@
</div> </div>
</td> </td>
</tr> </tr>
<tr class="shape-only shape-rotation"> <tr class="shape-rotation">
<td class="padding-small"> <td class="padding-small">
<div class="separator horizontal"></div> <div class="separator horizontal"></div>
</td> </td>
</tr> </tr>
<tr class="shape-only shape-rotation"> <tr class="shape-rotation">
<td class="padding-small"> <td class="padding-small">
<label class="header"><%= scope.textRotation %></label> <label class="header"><%= scope.textRotation %></label>
</td> </td>
</tr> </tr>
<tr class="shape-only shape-rotation"> <tr class="shape-rotation">
<td> <td>
<table cols="2" style="width: 100%;"> <table cols="2" style="width: 100%;">
<tr> <tr>

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

@ -761,8 +761,8 @@ define([
this._noApply = true; this._noApply = true;
this.disableControls(this._locked, !shapeprops.asc_getCanFill()); this.disableControls(this._locked, !shapeprops.asc_getCanFill());
this.hideShapeOnlySettings(shapeprops.asc_getFromChart() || shapeprops.asc_getFromImage()); this.hideShapeOnlySettings(shapeprops.asc_getFromChart() || !!shapeprops.asc_getFromImage());
this.hideRotationSettings(shapeprops.asc_getFromSmartArt()); this.hideRotationSettings(shapeprops.asc_getFromChart() || !!shapeprops.asc_getFromImage() || shapeprops.asc_getFromSmartArt());
var hidechangetype = shapeprops.get_FromChart() || shapeprops.asc_getFromSmartArt() || shapetype=='line' || shapetype=='bentConnector2' || shapetype=='bentConnector3' var hidechangetype = shapeprops.get_FromChart() || shapeprops.asc_getFromSmartArt() || shapetype=='line' || shapetype=='bentConnector2' || shapetype=='bentConnector3'
|| shapetype=='bentConnector4' || shapetype=='bentConnector5' || shapetype=='curvedConnector2' || shapetype=='bentConnector4' || shapetype=='bentConnector5' || shapetype=='curvedConnector2'