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
4deb5c68
Commit
4deb5c68
authored
Jan 17, 2017
by
Alexander.Trofimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
asc_getLocaleExample2 -> asc_getLocaleExample
parent
5cf5f1e0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
17 deletions
+17
-17
apps/spreadsheeteditor/main/app/controller/Toolbar.js
apps/spreadsheeteditor/main/app/controller/Toolbar.js
+1
-1
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
+3
-3
apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js
apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js
+13
-13
No files found.
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file @
4deb5c68
...
...
@@ -913,7 +913,7 @@ define([
var
me
=
this
,
info
=
me
.
api
.
asc_getCellInfo
();
me
.
toolbar
.
numFormatData
.
forEach
(
function
(
item
,
index
)
{
item
.
exampleval
=
me
.
api
.
asc_getLocaleExample
2
(
item
.
format
);
item
.
exampleval
=
me
.
api
.
asc_getLocaleExample
(
item
.
format
);
});
me
.
toolbar
.
cmbNumberFormat
.
setData
(
me
.
toolbar
.
numFormatData
);
me
.
toolbar
.
cmbNumberFormat
.
setValue
(
me
.
_state
.
numformattype
,
me
.
toolbar
.
txtCustom
);
...
...
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
View file @
4deb5c68
...
...
@@ -760,9 +760,9 @@ define([
info
.
asc_setType
(
Asc
.
c_oAscNumFormatType
.
None
);
info
.
asc_setSymbol
(
landId
);
var
arr
=
this
.
api
.
asc_getFormatCells
(
info
);
// all formats
text
=
this
.
api
.
asc_getLocaleExample
2
(
arr
[
2
],
1000.01
,
landId
);
text
=
text
+
'
'
+
this
.
api
.
asc_getLocaleExample
2
(
arr
[
4
],
(
new
Date
()).
getExcelDateWithTime
(),
landId
);
text
=
text
+
'
'
+
this
.
api
.
asc_getLocaleExample
2
(
arr
[
6
],
(
new
Date
()).
getExcelDateWithTime
(),
landId
);
text
=
this
.
api
.
asc_getLocaleExample
(
arr
[
2
],
1000.01
,
landId
);
text
=
text
+
'
'
+
this
.
api
.
asc_getLocaleExample
(
arr
[
4
],
(
new
Date
()).
getExcelDateWithTime
(),
landId
);
text
=
text
+
'
'
+
this
.
api
.
asc_getLocaleExample
(
arr
[
6
],
(
new
Date
()).
getExcelDateWithTime
(),
landId
);
}
$
(
'
#fms-lbl-reg-settings
'
).
text
(
_
.
isEmpty
(
text
)
?
''
:
this
.
strRegSettingsEx
+
text
);
}
...
...
apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js
View file @
4deb5c68
...
...
@@ -259,8 +259,8 @@ define([
this
.
onFormatSelect
(
this
.
cmbFormat
,
this
.
cmbFormat
.
getSelectedRecord
());
// for fraction - if props.format not in cmbType - setValue(this.txtCustom)
// for date/time - if props.format not in cmbType - setValue(this.api.asc_getLocaleExample
2
(props.format, 37973))
// for cmbNegative - if props.format not in cmbNegative - setValue(this.api.asc_getLocaleExample
2
(props.format))
// for date/time - if props.format not in cmbType - setValue(this.api.asc_getLocaleExample(props.format, 37973))
// for cmbNegative - if props.format not in cmbNegative - setValue(this.api.asc_getLocaleExample(props.format))
}
},
...
...
@@ -284,7 +284,7 @@ define([
onNegativeSelect
:
function
(
combo
,
record
)
{
this
.
Format
=
record
.
value
;
this
.
lblExample
.
text
(
this
.
api
.
asc_getLocaleExample
2
(
this
.
Format
));
this
.
lblExample
.
text
(
this
.
api
.
asc_getLocaleExample
(
this
.
Format
));
},
onSymbolsSelect
:
function
(
combo
,
record
)
{
...
...
@@ -298,14 +298,14 @@ define([
var
format
=
this
.
api
.
asc_getFormatCells
(
info
),
data
=
[];
format
.
forEach
(
function
(
item
)
{
data
.
push
({
value
:
item
,
displayValue
:
me
.
api
.
asc_getLocaleExample
2
(
item
,
-
1234.12345678901234567890
)});
data
.
push
({
value
:
item
,
displayValue
:
me
.
api
.
asc_getLocaleExample
(
item
,
-
1234.12345678901234567890
)});
});
this
.
cmbNegative
.
setData
(
data
);
this
.
cmbNegative
.
selectRecord
(
this
.
cmbNegative
.
store
.
at
(
0
));
this
.
cmbNegative
.
cmpEl
.
find
(
'
li:nth-child(2) a, li:nth-child(4) a
'
).
css
({
color
:
'
#ff0000
'
});
this
.
Format
=
format
[
0
];
this
.
lblExample
.
text
(
this
.
api
.
asc_getLocaleExample
2
(
this
.
Format
));
this
.
lblExample
.
text
(
this
.
api
.
asc_getLocaleExample
(
this
.
Format
));
},
onDecimalChange
:
function
(
field
,
newValue
,
oldValue
,
eOpts
){
...
...
@@ -320,7 +320,7 @@ define([
if
(
this
.
FormatType
==
Asc
.
c_oAscNumFormatType
.
Number
||
this
.
FormatType
==
Asc
.
c_oAscNumFormatType
.
Currency
||
this
.
FormatType
==
Asc
.
c_oAscNumFormatType
.
Accounting
)
{
var
data
=
[];
format
.
forEach
(
function
(
item
)
{
data
.
push
({
value
:
item
,
displayValue
:
me
.
api
.
asc_getLocaleExample
2
(
item
,
-
1234.12345678901234567890
)});
data
.
push
({
value
:
item
,
displayValue
:
me
.
api
.
asc_getLocaleExample
(
item
,
-
1234.12345678901234567890
)});
});
this
.
cmbNegative
.
setData
(
data
);
this
.
cmbNegative
.
selectRecord
(
this
.
cmbNegative
.
store
.
at
(
0
));
...
...
@@ -330,7 +330,7 @@ define([
this
.
Format
=
format
[
0
];
}
this
.
lblExample
.
text
(
this
.
api
.
asc_getLocaleExample
2
(
this
.
Format
));
this
.
lblExample
.
text
(
this
.
api
.
asc_getLocaleExample
(
this
.
Format
));
},
onSeparatorChange
:
function
(
field
,
newValue
,
oldValue
,
eOpts
){
...
...
@@ -343,24 +343,24 @@ define([
var
format
=
this
.
api
.
asc_getFormatCells
(
info
),
data
=
[];
format
.
forEach
(
function
(
item
)
{
data
.
push
({
value
:
item
,
displayValue
:
me
.
api
.
asc_getLocaleExample
2
(
item
,
-
1234.12345678901234567890
)});
data
.
push
({
value
:
item
,
displayValue
:
me
.
api
.
asc_getLocaleExample
(
item
,
-
1234.12345678901234567890
)});
});
this
.
cmbNegative
.
setData
(
data
);
this
.
cmbNegative
.
selectRecord
(
this
.
cmbNegative
.
store
.
at
(
0
));
this
.
cmbNegative
.
cmpEl
.
find
(
'
li:nth-child(2) a, li:nth-child(4) a
'
).
css
({
color
:
'
#ff0000
'
});
this
.
Format
=
format
[
0
];
this
.
lblExample
.
text
(
this
.
api
.
asc_getLocaleExample
2
(
this
.
Format
));
this
.
lblExample
.
text
(
this
.
api
.
asc_getLocaleExample
(
this
.
Format
));
},
onTypeSelect
:
function
(
combo
,
record
){
this
.
Format
=
record
.
value
;
this
.
lblExample
.
text
(
this
.
api
.
asc_getLocaleExample
2
(
this
.
Format
));
this
.
lblExample
.
text
(
this
.
api
.
asc_getLocaleExample
(
this
.
Format
));
},
onCodeSelect
:
function
(
combo
,
record
){
this
.
Format
=
record
.
value
;
this
.
lblExample
.
text
(
this
.
api
.
asc_getLocaleExample
2
(
this
.
Format
));
this
.
lblExample
.
text
(
this
.
api
.
asc_getLocaleExample
(
this
.
Format
));
},
onFormatSelect
:
function
(
combo
,
record
)
{
...
...
@@ -403,7 +403,7 @@ define([
data
=
[],
exampleVal
=
(
record
.
value
==
Asc
.
c_oAscNumFormatType
.
Date
)
?
37973
:
((
record
.
value
==
Asc
.
c_oAscNumFormatType
.
Time
)
?
0.123
:
parseFloat
(
"
-1234.12345678901234567890
"
));
formatsarr
.
forEach
(
function
(
item
)
{
data
.
push
({
value
:
item
,
displayValue
:
me
.
api
.
asc_getLocaleExample
2
(
item
,
exampleVal
)});
data
.
push
({
value
:
item
,
displayValue
:
me
.
api
.
asc_getLocaleExample
(
item
,
exampleVal
)});
});
if
(
hasNegative
)
{
this
.
cmbNegative
.
setData
(
data
);
...
...
@@ -432,7 +432,7 @@ define([
this
.
cmbCode
.
setValue
(
this
.
Format
);
}
this
.
lblExample
.
text
(
this
.
api
.
asc_getLocaleExample
2
(
this
.
Format
));
this
.
lblExample
.
text
(
this
.
api
.
asc_getLocaleExample
(
this
.
Format
));
this
.
_decimalPanel
.
toggleClass
(
'
hidden
'
,
!
hasDecimal
);
this
.
_negativePanel
.
css
(
'
visibility
'
,
hasNegative
?
''
:
'
hidden
'
);
...
...
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