Commit 2ed9b0c9 authored by Julia Radzhabova's avatar Julia Radzhabova

[DE] TableSettingsAdvanced: баг при последовательном изменении position->align...

[DE] TableSettingsAdvanced: баг при последовательном изменении position->align и wrapping->inline. Изменение верстки для Text Wrapping.
parent 14b6f648
...@@ -146,10 +146,11 @@ ...@@ -146,10 +146,11 @@
</div> </div>
<div id="id-adv-table-wrap" class="settings-panel"> <div id="id-adv-table-wrap" class="settings-panel">
<div class="inner-content padding-large"> <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-none" style="display: inline-block; margin-right:5px;"></div>
<div id="tableadv-button-wrap-parallel" style="display: inline-block; margin-right:5px;"></div> <div id="tableadv-button-wrap-parallel" style="display: inline-block; margin-right:5px;"></div>
</div> </div>
<div class="separator horizontal padding-large"></div> <div class="padding-small"></div>
<div class="inner-content"> <div class="inner-content">
<div id="tableadv-panel-align" style="width: 100%;"> <div id="tableadv-panel-align" style="width: 100%;">
<label class="header padding-small"><%= scope.textAlign %></label> <label class="header padding-small"><%= scope.textAlign %></label>
......
...@@ -1473,11 +1473,11 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat ...@@ -1473,11 +1473,11 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
if (this._changedProps && btn.pressed) { if (this._changedProps && btn.pressed) {
if (this._state.alignChanged) { if (this._state.alignChanged) {
if (this._state.HAlignType===Asc.c_oAscXAlign.Left) 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) 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) else if (this._state.HAlignType==Asc.c_oAscXAlign.Right)
this.btnAlignRight.toggle(true, true); this.btnAlignRight.toggle(true);
this._state.alignChanged = false; this._state.alignChanged = false;
} }
...@@ -2176,7 +2176,8 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat ...@@ -2176,7 +2176,8 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
textWrapText: 'Wrap text', textWrapText: 'Wrap text',
textTable: 'Table', textTable: 'Table',
textTableSize: 'Table Size', textTableSize: 'Table Size',
textTablePosition: 'Table Position' textTablePosition: 'Table Position',
textWrappingStyle: 'Wrapping Style'
}, DE.Views.TableSettingsAdvanced || {})); }, DE.Views.TableSettingsAdvanced || {}));
}); });
...@@ -1355,6 +1355,7 @@ ...@@ -1355,6 +1355,7 @@
"DE.Views.TableSettingsAdvanced.textWrap": "Text Wrapping", "DE.Views.TableSettingsAdvanced.textWrap": "Text Wrapping",
"DE.Views.TableSettingsAdvanced.textWrapNoneTooltip": "Inline table", "DE.Views.TableSettingsAdvanced.textWrapNoneTooltip": "Inline table",
"DE.Views.TableSettingsAdvanced.textWrapParallelTooltip": "Flow 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.tipAll": "Set Outer Border and All Inner Lines",
"DE.Views.TableSettingsAdvanced.tipCellAll": "Set Borders for Inner Cells Only", "DE.Views.TableSettingsAdvanced.tipCellAll": "Set Borders for Inner Cells Only",
"DE.Views.TableSettingsAdvanced.tipCellInner": "Set Vertical and Horizontal Lines for Inner Cells Only", "DE.Views.TableSettingsAdvanced.tipCellInner": "Set Vertical and Horizontal Lines for Inner Cells Only",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment