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
04872f23
Commit
04872f23
authored
Dec 05, 2016
by
Alexey Golubev
Committed by
GitHub
Dec 05, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #44 from ONLYOFFICE/release/v4.2.0
[SSE] Fix Bug 33598.
parents
5b71bd2f
48d244a5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
6 deletions
+4
-6
apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js
apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js
+4
-6
No files found.
apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js
View file @
04872f23
...
...
@@ -1263,8 +1263,6 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
var
changed
=
false
,
value
=
this
.
cmbEmptyCells
.
getValue
();
if
(
rawData
.
type
!==
Asc
.
c_oAscSparklineType
.
Line
&&
this
.
_arrEmptyCells
.
length
>
2
)
{
if
(
value
==
Asc
.
c_oAscEDispBlanksAs
.
Span
)
value
=
Asc
.
c_oAscEDispBlanksAs
.
Gap
;
this
.
_arrEmptyCells
.
pop
();
changed
=
true
;
}
else
if
(
rawData
.
type
==
Asc
.
c_oAscSparklineType
.
Line
&&
this
.
_arrEmptyCells
.
length
<
3
)
{
...
...
@@ -1273,9 +1271,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
}
if
(
changed
)
{
this
.
cmbEmptyCells
.
setData
(
this
.
_arrEmptyCells
);
this
.
cmbEmptyCells
.
setValue
(
value
);
if
(
this
.
_changedProps
)
this
.
_changedProps
.
asc_setDisplayEmpty
(
value
);
this
.
cmbEmptyCells
.
setValue
((
rawData
.
type
!==
Asc
.
c_oAscSparklineType
.
Line
&&
value
==
Asc
.
c_oAscEDispBlanksAs
.
Span
)
?
this
.
textEmptyLine
:
value
);
}
this
.
updateSparkStyles
(
this
.
chartSettings
.
asc_getStyles
());
...
...
@@ -1360,7 +1356,9 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
if
(
this
.
_state
.
SparkType
!==
Asc
.
c_oAscSparklineType
.
Line
)
this
.
_arrEmptyCells
.
pop
();
this
.
cmbEmptyCells
.
setData
(
this
.
_arrEmptyCells
);
this
.
cmbEmptyCells
.
setValue
(
props
.
asc_getDisplayEmpty
());
var
value
=
props
.
asc_getDisplayEmpty
();
this
.
cmbEmptyCells
.
setValue
((
this
.
_state
.
SparkType
!==
Asc
.
c_oAscSparklineType
.
Line
&&
value
==
Asc
.
c_oAscEDispBlanksAs
.
Span
)
?
this
.
textEmptyLine
:
value
);
this
.
chShowEmpty
.
setValue
(
props
.
asc_getDisplayHidden
(),
true
);
this
.
chShowAxis
.
setValue
(
props
.
asc_getDisplayXAxis
(),
true
);
...
...
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