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
5f362a0e
Commit
5f362a0e
authored
Feb 20, 2017
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SSE] FormatSettingsDialog: debug getting format properties.
parent
2a52cc7a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
7 deletions
+10
-7
apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js
apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js
+10
-7
No files found.
apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js
View file @
5f362a0e
...
...
@@ -267,7 +267,7 @@ define([
if
((
props
.
formatInfo
.
asc_getType
()
==
Asc
.
c_oAscNumFormatType
.
Custom
)
&&
props
.
format
)
this
.
CustomFormat
=
this
.
Format
=
props
.
format
;
this
.
onFormatSelect
(
this
.
cmbFormat
,
this
.
cmbFormat
.
getSelectedRecord
());
this
.
onFormatSelect
(
this
.
cmbFormat
,
this
.
cmbFormat
.
getSelectedRecord
()
,
null
,
props
.
formatInfo
);
if
(
this
.
_state
.
hasDecimal
)
this
.
spnDecimal
.
setValue
(
props
.
formatInfo
.
asc_getDecimalPlaces
());
if
(
this
.
_state
.
hasSeparator
)
...
...
@@ -398,7 +398,7 @@ define([
this
.
lblExample
.
text
(
this
.
api
.
asc_getLocaleExample
(
this
.
Format
));
},
onFormatSelect
:
function
(
combo
,
record
)
{
onFormatSelect
:
function
(
combo
,
record
,
e
,
initFormatInfo
)
{
if
(
!
record
)
return
;
this
.
FormatType
=
record
.
value
;
...
...
@@ -410,13 +410,16 @@ define([
hasType
=
(
record
.
value
==
Asc
.
c_oAscNumFormatType
.
Date
||
record
.
value
==
Asc
.
c_oAscNumFormatType
.
Time
||
record
.
value
==
Asc
.
c_oAscNumFormatType
.
Fraction
),
hasSymbols
=
(
record
.
value
==
Asc
.
c_oAscNumFormatType
.
Accounting
||
record
.
value
==
Asc
.
c_oAscNumFormatType
.
Currency
),
hasCode
=
(
record
.
value
==
Asc
.
c_oAscNumFormatType
.
Custom
),
me
=
this
;
me
=
this
,
valDecimal
=
(
initFormatInfo
)
?
initFormatInfo
.
asc_getDecimalPlaces
()
:
this
.
spnDecimal
.
getNumberValue
(),
valSeparator
=
(
initFormatInfo
)
?
initFormatInfo
.
asc_getSeparator
()
:
(
this
.
chSeparator
.
getValue
()
==
'
checked
'
),
valSymbol
=
(
initFormatInfo
&&
initFormatInfo
.
asc_getSymbol
())
?
initFormatInfo
.
asc_getSymbol
()
:
this
.
langId
;
if
(
record
.
value
!==
Asc
.
c_oAscNumFormatType
.
Custom
)
{
var
info
=
new
Asc
.
asc_CFormatCellsInfo
();
info
.
asc_setType
(
record
.
value
);
info
.
asc_setDecimalPlaces
(
hasDecimal
?
this
.
spnDecimal
.
getNumberValue
()
:
0
);
info
.
asc_setSeparator
(
hasSeparator
?
this
.
chSeparator
.
getValue
()
==
'
checked
'
:
false
);
info
.
asc_setDecimalPlaces
(
hasDecimal
?
valDecimal
:
0
);
info
.
asc_setSeparator
(
hasSeparator
?
valSeparator
:
false
);
if
(
hasNegative
||
record
.
value
==
Asc
.
c_oAscNumFormatType
.
Date
||
record
.
value
==
Asc
.
c_oAscNumFormatType
.
Time
)
{
if
(
hasSymbols
)
{
...
...
@@ -429,7 +432,7 @@ define([
}
}
this
.
cmbSymbols
.
setData
(
this
.
CurrencySymbolsData
);
this
.
cmbSymbols
.
setValue
(
this
.
langId
);
this
.
cmbSymbols
.
setValue
(
valSymbol
);
}
info
.
asc_setSymbol
(
this
.
cmbSymbols
.
getValue
());
}
...
...
@@ -460,7 +463,7 @@ define([
}
else
{
var
info
=
new
Asc
.
asc_CFormatCellsInfo
();
info
.
asc_setType
(
Asc
.
c_oAscNumFormatType
.
None
);
info
.
asc_setSymbol
(
this
.
langId
);
info
.
asc_setSymbol
(
valSymbol
);
var
formatsarr
=
this
.
api
.
asc_getFormatCells
(
info
),
data
=
[],
...
...
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