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

Merge pull request #1908 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2022-08-23 15:26:02 +03:00 committed by GitHub
parent 1689451752 8662ab8fa4
commit a77f70553b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -710,8 +710,10 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
value = props.asc_getRot();
this.spnAngle.setValue((value==undefined || value===null) ? '' : Math.floor(value*180/3.14159265358979+0.5), true);
this.chFlipHor.setValue(props.asc_getFlipH());
this.chFlipVert.setValue(props.asc_getFlipV());
value = props.asc_getFlipH();
this.chFlipHor.setValue((value==undefined || value===null) ? 'indeterminate' : value);
value = props.asc_getFlipV();
this.chFlipVert.setValue((value==undefined || value===null) ? 'indeterminate' : value);
this._changedProps = new Asc.asc_CShapeProperty();
}
@ -742,8 +744,10 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
this._changedProps.asc_putDescription(this.textareaAltDescription.val());
this._changedProps.asc_putRot(this.spnAngle.getNumberValue() * 3.14159265358979 / 180);
this._changedProps.asc_putFlipH(this.chFlipHor.getValue()=='checked');
this._changedProps.asc_putFlipV(this.chFlipVert.getValue()=='checked');
if (this.chFlipHor.getValue()!=='indeterminate')
this._changedProps.asc_putFlipH(this.chFlipHor.getValue()==='checked');
if (this.chFlipVert.getValue()!=='indeterminate')
this._changedProps.asc_putFlipV(this.chFlipVert.getValue()==='checked');
Common.localStorage.setItem("pe-settings-shaperatio", (this.btnRatio.pressed) ? 1 : 0);
return { shapeProps: this._changedProps} ;

24
apps/spreadsheeteditor/main/app/template/PivotSettingsAdvanced.template
View file

@ -1,55 +1,57 @@
<div id="id-adv-pivot-layout" class="settings-panel active">
<div class="inner-content">
<table cols="1" style="width: 100%;">
<table cols="2" style="width: 100%;">
<tr>
<td class="padding-large">
<td colspan="2" class="padding-large">
<label class="header"><%= scope.txtName %></label>
<div id="pivot-adv-name"></div>
</td>
</tr>
<tr>
<td class="padding-small">
<td colspan="2" class="padding-small">
<label class="header"><%= scope.textGrandTotals %></label>
</td>
</tr>
<tr>
<td class="padding-small">
<td colspan="2" class="padding-small">
<div id="pivot-adv-chk-show-rows"></div>
</td>
</tr>
<tr>
<td class="padding-large">
<td colspan="2" class="padding-large">
<div id="pivot-adv-chk-show-columns"></div>
</td>
</tr>
<tr>
<td class="padding-small">
<td colspan="2" class="padding-small">
<label class="header"><%= scope.textDisplayFields %></label>
</td>
</tr>
<tr>
<td class="padding-small">
<td colspan="2" class="padding-small">
<div id="pivot-adv-radio-down"></div>
</td>
</tr>
<tr>
<td class="padding-small">
<td colspan="2" class="padding-small">
<div id="pivot-adv-radio-over"></div>
</td>
</tr>
<tr>
<td class="padding-large">
<label id="pivot-adv-label-wrap" class="input-label" style="margin-top: 4px;"></label>
<label id="pivot-adv-label-wrap" class="input-label"></label>
</td>
<td class="padding-large">
<div id="pivot-adv-spin-wrap" style="float: right; width: 85px;"></div>
</td>
</tr>
<tr>
<td class="padding-small">
<td colspan="2" class="padding-small">
<div id="pivot-adv-chk-show-headers"></div>
</td>
</tr>
<tr>
<td class="padding-small">
<td colspan="2" class="padding-small">
<div id="pivot-adv-chk-autofit-col-width"></div>
</td>
</tr>

2
apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js
View file

@ -50,7 +50,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
SSE.Views.ChartSettingsDlg = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 322,
contentWidth: 327,
height: 535,
toggleGroup: 'chart-settings-dlg-group',
storageName: 'sse-chart-settings-adv-category'

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

@ -50,8 +50,8 @@ define([ 'text!spreadsheeteditor/main/app/template/PivotSettingsAdvanced.temp
SSE.Views.PivotSettingsAdvanced = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 300,
height: 395,
contentWidth: 310,
height: 440,
toggleGroup: 'pivot-adv-settings-group',
storageName: 'sse-pivot-adv-settings-category'
},