Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
web-apps
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
web-apps
Commits
bc40ac2e
Commit
bc40ac2e
authored
Apr 28, 2017
by
Alexey Golubev
Browse files
Options
Browse Files
Download
Plain Diff
Merge tag 'v4.3.3' into develop
v4.3.3 v4.3.3
parents
1971c2e7
444e463c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
2 deletions
+5
-2
apps/documenteditor/main/app/view/NoteSettingsDialog.js
apps/documenteditor/main/app/view/NoteSettingsDialog.js
+2
-2
apps/documenteditor/main/resources/img/toolbar-menu.png
apps/documenteditor/main/resources/img/toolbar-menu.png
+0
-0
apps/documenteditor/main/resources/img/toolbar-menu@2x.png
apps/documenteditor/main/resources/img/toolbar-menu@2x.png
+0
-0
apps/documenteditor/main/resources/less/statusbar.less
apps/documenteditor/main/resources/less/statusbar.less
+1
-0
apps/spreadsheeteditor/main/app/controller/Toolbar.js
apps/spreadsheeteditor/main/app/controller/Toolbar.js
+2
-0
No files found.
apps/documenteditor/main/app/view/NoteSettingsDialog.js
View file @
bc40ac2e
...
...
@@ -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>
'
,
...
...
apps/documenteditor/main/resources/img/toolbar-menu.png
View replaced file @
1971c2e7
View file @
bc40ac2e
18.9 KB
|
W:
|
H:
19.1 KB
|
W:
|
H:
2-up
Swipe
Onion skin
apps/documenteditor/main/resources/img/toolbar-menu@2x.png
View replaced file @
1971c2e7
View file @
bc40ac2e
48 KB
|
W:
|
H:
48.6 KB
|
W:
|
H:
2-up
Swipe
Onion skin
apps/documenteditor/main/resources/less/statusbar.less
View file @
bc40ac2e
...
...
@@ -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);
...
...
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file @
bc40ac2e
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment