Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sdkjs
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
sdkjs
Commits
f7df9be0
Commit
f7df9be0
authored
Aug 24, 2017
by
Alexander.Trofimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
delete valign to string
delete string to valign
parent
afae148a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
29 deletions
+4
-29
cell/api.js
cell/api.js
+2
-3
cell/utils/utils.js
cell/utils/utils.js
+0
-24
cell/view/WorksheetView.js
cell/view/WorksheetView.js
+2
-2
No files found.
cell/api.js
View file @
f7df9be0
...
...
@@ -2960,12 +2960,11 @@ var editor;
};
spreadsheet_api
.
prototype
.
asc_setCellVertAlign
=
function
(
align
)
{
var
va
=
AscCommonExcel
.
verticalAlignFromString
(
align
);
var
ws
=
this
.
wb
.
getWorksheet
();
if
(
ws
.
objectRender
.
selectedGraphicObjectsExists
()
&&
ws
.
objectRender
.
controller
.
setCellVertAlign
)
{
ws
.
objectRender
.
controller
.
setCellVertAlign
(
va
);
ws
.
objectRender
.
controller
.
setCellVertAlign
(
align
);
}
else
{
this
.
wb
.
getWorksheet
().
setSelectionInfo
(
"
va
"
,
va
);
this
.
wb
.
getWorksheet
().
setSelectionInfo
(
"
va
"
,
align
);
this
.
wb
.
restoreFocus
();
}
};
...
...
cell/utils/utils.js
View file @
f7df9be0
...
...
@@ -91,28 +91,6 @@
}
return
ha
;
}
function
verticalAlignFromString
(
val
)
{
var
va
=
null
;
switch
(
val
)
{
case
"
bottom
"
:
va
=
Asc
.
c_oAscVAlign
.
Bottom
;
break
;
case
"
center
"
:
va
=
Asc
.
c_oAscVAlign
.
Center
;
break
;
case
"
distributed
"
:
va
=
Asc
.
c_oAscVAlign
.
Dist
;
break
;
case
"
justify
"
:
va
=
Asc
.
c_oAscVAlign
.
Just
;
break
;
case
"
top
"
:
va
=
Asc
.
c_oAscVAlign
.
Top
;
break
;
}
return
va
;
}
function
verticalAlignToString
(
val
)
{
var
va
=
"
none
"
;
switch
(
val
)
{
case
Asc
.
c_oAscVAlign
.
Bottom
:
va
=
"
bottom
"
;
break
;
case
Asc
.
c_oAscVAlign
.
Center
:
va
=
"
center
"
;
break
;
case
Asc
.
c_oAscVAlign
.
Dist
:
va
=
"
distributed
"
;
break
;
case
Asc
.
c_oAscVAlign
.
Just
:
va
=
"
justify
"
;
break
;
case
Asc
.
c_oAscVAlign
.
Top
:
va
=
"
top
"
;
break
;
}
return
va
;
}
function
applyFunction
(
callback
)
{
if
(
kFunctionL
===
typeof
callback
)
{
...
...
@@ -2355,8 +2333,6 @@
window
[
"
AscCommonExcel
"
].
applyFunction
=
applyFunction
;
window
[
"
AscCommonExcel
"
].
horizontalAlignFromString
=
horizontalAlignFromString
;
window
[
"
AscCommonExcel
"
].
horizontalAlignToString
=
horizontalAlignToString
;
window
[
"
AscCommonExcel
"
].
verticalAlignFromString
=
verticalAlignFromString
;
window
[
"
AscCommonExcel
"
].
verticalAlignToString
=
verticalAlignToString
;
window
[
"
Asc
"
].
typeOf
=
typeOf
;
window
[
"
Asc
"
].
lastIndexOf
=
lastIndexOf
;
window
[
"
Asc
"
].
search
=
search
;
...
...
cell/view/WorksheetView.js
View file @
f7df9be0
...
...
@@ -6800,7 +6800,7 @@
cell_info
.
text
=
c
.
getValueForEdit
();
cell_info
.
halign
=
AscCommonExcel
.
horizontalAlignToString
(
align
.
getAlignHorizontal
());
cell_info
.
valign
=
AscCommonExcel
.
verticalAlignToString
(
align
.
getAlignVertical
()
);
cell_info
.
valign
=
align
.
getAlignVertical
(
);
var
tablePartsOptions
=
selectionRange
.
isSingleRange
()
?
this
.
model
.
autoFilters
.
searchRangeInTableParts
(
selectionRange
.
getLast
())
:
-
2
;
...
...
@@ -7006,7 +7006,7 @@
}
objectInfo
.
halign
=
AscCommonExcel
.
horizontalAlignToString
(
horAlign
);
objectInfo
.
valign
=
AscCommonExcel
.
verticalAlignToString
(
vertAlign
)
;
objectInfo
.
valign
=
vertAlign
;
objectInfo
.
angle
=
angle
;
objectInfo
.
font
=
new
asc_CFont
();
...
...
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