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
c1fcad76
Commit
c1fcad76
authored
Nov 07, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SSE] Bug 26981.
parent
08e61d9c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
14 deletions
+13
-14
apps/spreadsheeteditor/main/app/controller/Toolbar.js
apps/spreadsheeteditor/main/app/controller/Toolbar.js
+13
-14
No files found.
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file @
c1fcad76
...
...
@@ -1557,13 +1557,10 @@ define([
onApiSelectionChanged
:
function
(
info
)
{
if
(
!
this
.
editMode
)
return
;
var
selectionType
=
info
.
asc_getFlags
().
asc_getSelectionType
();
var
coauth_disable
=
(
!
this
.
toolbar
.
mode
.
isEditMailMerge
&&
!
this
.
toolbar
.
mode
.
isEditDiagram
)
?
(
info
.
asc_getLocked
()
===
true
)
:
false
;
if
(
this
.
_disableEditOptions
(
selectionType
,
coauth_disable
))
{
return
;
}
var
me
=
this
,
var
selectionType
=
info
.
asc_getFlags
().
asc_getSelectionType
(),
coauth_disable
=
(
!
this
.
toolbar
.
mode
.
isEditMailMerge
&&
!
this
.
toolbar
.
mode
.
isEditDiagram
)
?
(
info
.
asc_getLocked
()
===
true
)
:
false
,
editOptionsDisabled
=
this
.
_disableEditOptions
(
selectionType
,
coauth_disable
),
me
=
this
,
toolbar
=
this
.
toolbar
,
fontobj
=
info
.
asc_getFont
(),
val
,
need_disable
=
false
;
...
...
@@ -1574,6 +1571,15 @@ define([
Common
.
NotificationCenter
.
trigger
(
'
fonts:change
'
,
fontobj
);
}
/* read font size */
var
str_size
=
fontobj
.
asc_getSize
();
if
(
this
.
_state
.
fontsize
!==
str_size
)
{
toolbar
.
cmbFontSize
.
setValue
((
str_size
!==
undefined
)
?
str_size
:
''
);
this
.
_state
.
fontsize
=
str_size
;
}
if
(
editOptionsDisabled
)
return
;
/* read font params */
if
(
!
toolbar
.
mode
.
isEditMailMerge
&&
!
toolbar
.
mode
.
isEditDiagram
)
{
val
=
fontobj
.
asc_getBold
();
...
...
@@ -1593,13 +1599,6 @@ define([
}
}
/* read font size */
var
str_size
=
fontobj
.
asc_getSize
();
if
(
this
.
_state
.
fontsize
!==
str_size
)
{
toolbar
.
cmbFontSize
.
setValue
((
str_size
!==
undefined
)
?
str_size
:
''
);
this
.
_state
.
fontsize
=
str_size
;
}
/* read font color */
var
clr
,
color
,
...
...
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