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

[DE] TableSettingsAdvanced: баг при последовательном изменении position->align и wrapping->inline. Изменение верстки для Text Wrapping.

Browse source
This commit is contained in:
Julia Radzhabova 2016-05-05 12:15:52 +03:00
parent 14b6f64895
commit 2ed9b0c93d
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/documenteditor/main/app/template/TableSettingsAdvanced.template
View file

@ -146,10 +146,11 @@
</div>
<div id="id-adv-table-wrap" class="settings-panel">
<div class="inner-content padding-large">
<label class="header padding-small" style="display: block;"><%= scope.textWrappingStyle %></label>
<div id="tableadv-button-wrap-none" style="display: inline-block; margin-right:5px;"></div>
<div id="tableadv-button-wrap-parallel" style="display: inline-block; margin-right:5px;"></div>
</div>
<div class="separator horizontal padding-large"></div>
<div class="padding-small"></div>
<div class="inner-content">
<div id="tableadv-panel-align" style="width: 100%;">
<label class="header padding-small"><%= scope.textAlign %></label>

9
apps/documenteditor/main/app/view/TableSettingsAdvanced.js
View file

@ -1473,11 +1473,11 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
if (this._changedProps && btn.pressed) {
if (this._state.alignChanged) {
if (this._state.HAlignType===Asc.c_oAscXAlign.Left)
this.btnAlignLeft.toggle(true, true);
this.btnAlignLeft.toggle(true);
else if (this._state.HAlignType==Asc.c_oAscXAlign.Center)
this.btnAlignCenter.toggle(true, true);
this.btnAlignCenter.toggle(true);
else if (this._state.HAlignType==Asc.c_oAscXAlign.Right)
this.btnAlignRight.toggle(true, true);
this.btnAlignRight.toggle(true);
this._state.alignChanged = false;
}
@ -2176,7 +2176,8 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
textWrapText: 'Wrap text',
textTable: 'Table',
textTableSize: 'Table Size',
textTablePosition: 'Table Position'
textTablePosition: 'Table Position',
textWrappingStyle: 'Wrapping Style'
}, DE.Views.TableSettingsAdvanced || {}));
});

1
apps/documenteditor/main/locale/en.json
View file

@ -1355,6 +1355,7 @@
"DE.Views.TableSettingsAdvanced.textWrap": "Text Wrapping",
"DE.Views.TableSettingsAdvanced.textWrapNoneTooltip": "Inline table",
"DE.Views.TableSettingsAdvanced.textWrapParallelTooltip": "Flow table",
"DE.Views.TableSettingsAdvanced.textWrappingStyle": "Wrapping Style",
"DE.Views.TableSettingsAdvanced.tipAll": "Set Outer Border and All Inner Lines",
"DE.Views.TableSettingsAdvanced.tipCellAll": "Set Borders for Inner Cells Only",
"DE.Views.TableSettingsAdvanced.tipCellInner": "Set Vertical and Horizontal Lines for Inner Cells Only",