Commit bc40ac2e authored by Alexey Golubev's avatar Alexey Golubev

Merge tag 'v4.3.3' into develop

v4.3.3 v4.3.3
parents 1971c2e7 444e463c
......@@ -85,10 +85,10 @@ define([
'</tr>',
'<tr>',
'<td class="padding-small">',
'<div style="display: inline-block; margin-right: 10px;">',
'<div style="display: inline-block; margin-right: 10px; vertical-align: middle;">',
'<label class="input-label">', me.textNumFormat,'</label>',
'<div id="note-settings-combo-format" class="input-group-nr" style="width:150px;"></div>',
'</div>','<div style="display: inline-block;">',
'</div>','<div style="display: inline-block; vertical-align: middle;">',
'<label class="input-label">', me.textStart,'</label>',
'<div id="note-settings-spin-start"></div>',
'</div>',
......
......@@ -287,6 +287,7 @@
&.sl, &.sl-SI {background-position: 0 -1756px;}
&.sr, &.sr-Cyrl-RS, &.sr-Latn-RS {background-position: -16px -1756px;}
&.sk, &.sk-SK {background-position: -32px -1756px;}
&.kk, &.kk-KZ {background-position: 0 -1768px;}
}
.button-normal-icon(btn-ic-zoomtowidth, 55, @toolbar-icon-size);
......
......@@ -1754,6 +1754,7 @@ define([
toolbar.lockToolbar(SSE.enumLock.cantHyperlink, (selectionType == Asc.c_oAscSelectionType.RangeShapeText) && (this.api.asc_canAddShapeHyperlink()===false), { array: [toolbar.btnInsertHyperlink]});
/*
need_disable = selectionType != Asc.c_oAscSelectionType.RangeCells && selectionType != Asc.c_oAscSelectionType.RangeCol &&
selectionType != Asc.c_oAscSelectionType.RangeRow && selectionType != Asc.c_oAscSelectionType.RangeMax;
if (this._state.sparklines_disabled !== need_disable) {
......@@ -1763,6 +1764,7 @@ define([
this._state.sparklines_disabled = need_disable;
}
}
*/
if (editOptionsDisabled) return;
......
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