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

Merge branch 'hotfix/v4.3.3'

Browse source
This commit is contained in:
Alexey Golubev 2017-04-28 12:45:18 +03:00
parent 8c3b46382a ae8fc3c631
commit 444e463c9f
5 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/documenteditor/main/app/view/NoteSettingsDialog.js
View file

@ -85,10 +85,10 @@ define([
'</tr>', '</tr>',
'<tr>', '<tr>',
'<td class="padding-small">', '<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>', '<label class="input-label">', me.textNumFormat,'</label>',
'<div id="note-settings-combo-format" class="input-group-nr" style="width:150px;"></div>', '<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>', '<label class="input-label">', me.textStart,'</label>',
'<div id="note-settings-spin-start"></div>', '<div id="note-settings-spin-start"></div>',
'</div>', '</div>',

BIN
apps/documenteditor/main/resources/img/toolbar-menu.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

BIN
apps/documenteditor/main/resources/img/toolbar-menu@2x.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 49 KiB

1
apps/documenteditor/main/resources/less/statusbar.less
View file

@ -287,6 +287,7 @@
&.sl, &.sl-SI {background-position: 0 -1756px;} &.sl, &.sl-SI {background-position: 0 -1756px;}
&.sr, &.sr-Cyrl-RS, &.sr-Latn-RS {background-position: -16px -1756px;} &.sr, &.sr-Cyrl-RS, &.sr-Latn-RS {background-position: -16px -1756px;}
&.sk, &.sk-SK {background-position: -32px -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); .button-normal-icon(btn-ic-zoomtowidth, 55, @toolbar-icon-size);

2
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -1741,6 +1741,7 @@ define([
toolbar.lockToolbar(SSE.enumLock.cantHyperlink, (selectionType == Asc.c_oAscSelectionType.RangeShapeText) && (this.api.asc_canAddShapeHyperlink()===false), { array: [toolbar.btnInsertHyperlink]}); 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 && need_disable = selectionType != Asc.c_oAscSelectionType.RangeCells && selectionType != Asc.c_oAscSelectionType.RangeCol &&
selectionType != Asc.c_oAscSelectionType.RangeRow && selectionType != Asc.c_oAscSelectionType.RangeMax; selectionType != Asc.c_oAscSelectionType.RangeRow && selectionType != Asc.c_oAscSelectionType.RangeMax;
if (this._state.sparklines_disabled !== need_disable) { if (this._state.sparklines_disabled !== need_disable) {
@ -1750,6 +1751,7 @@ define([
this._state.sparklines_disabled = need_disable; this._state.sparklines_disabled = need_disable;
} }
} }
*/
if (editOptionsDisabled) return; if (editOptionsDisabled) return;