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
a7d62eb3
Commit
a7d62eb3
authored
May 04, 2017
by
Oleg Korshul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
b804fa01
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
16 additions
and
14 deletions
+16
-14
common/Charts/charts.js
common/Charts/charts.js
+1
-1
common/Drawings/Format/ChartSpace.js
common/Drawings/Format/ChartSpace.js
+1
-1
common/Drawings/Format/Format.js
common/Drawings/Format/Format.js
+1
-1
common/Drawings/Format/GroupShape.js
common/Drawings/Format/GroupShape.js
+0
-5
common/SerializeCommonWordExcel.js
common/SerializeCommonWordExcel.js
+1
-1
common/apiCommon.js
common/apiCommon.js
+9
-5
common/docscoapi.js
common/docscoapi.js
+3
-0
No files found.
common/Charts/charts.js
View file @
a7d62eb3
...
...
@@ -1037,7 +1037,7 @@ function GenerateWordArtPrewiewCode()
{
oRetString
+=
"
\n\t\t
{Type:
\"
"
+
aByTypes
[
j
][
'
Type
'
]
+
"
\"
, Image:
\"
"
+
oWordArtPreview
.
getWordArtPreview
(
aByTypes
[
j
][
'
Image
'
])
+
"
\"
}
"
+
((
j
===
aByTypes
.
length
-
1
)
?
""
:
"
,
"
);
}
oRetString
+=
"
\n\t
]
"
+
(
i
<
(
g_PresetTxWarpTypes
.
length
-
1
)
?
"
,
"
:
""
);
oRetString
+=
"
\n\t
]
"
+
(
i
<
(
AscCommon
.
g_PresetTxWarpTypes
.
length
-
1
)
?
"
,
"
:
""
);
}
oRetString
+=
"
\n
];
"
;
return
oRetString
;
...
...
common/Drawings/Format/ChartSpace.js
View file @
a7d62eb3
...
...
@@ -1994,7 +1994,7 @@ CChartSpace.prototype.rebuildSeriesFromAsc = function(asc_chart)
var
oDPt
=
new
AscFormat
.
CDPt
();
oDPt
.
setBubble3D
(
false
);
oDPt
.
setIdx
(
j
);
ApplySpPr
(
oFirstSpPrPreset
,
oDPt
,
j
,
base_fills
,
bAccent1Background
);
A
scFormat
.
A
pplySpPr
(
oFirstSpPrPreset
,
oDPt
,
j
,
base_fills
,
bAccent1Background
);
series
.
series
[
i
].
addDPt
(
oDPt
);
}
}
...
...
common/Drawings/Format/Format.js
View file @
a7d62eb3
...
...
@@ -9993,7 +9993,7 @@ function CorrectUniColor(asc_color, unicolor, flag)
function
builder_CreateGradientStop
(
oUniColor
,
nPos
){
var
Gs
=
new
AscFormat
.
CGs
();
Gs
.
pos
=
p
os
;
Gs
.
pos
=
nP
os
;
Gs
.
color
=
oUniColor
;
return
Gs
;
}
...
...
common/Drawings/Format/GroupShape.js
View file @
a7d62eb3
...
...
@@ -598,11 +598,6 @@ function CGroupShape()
return
this
.
scaleCoefficients
;
};
CGroupShape
.
prototype
.
getType
=
function
()
{
return
DRAWING_OBJECT_TYPE_GROUP
;
};
CGroupShape
.
prototype
.
getCompiledTransparent
=
function
()
{
return
null
;
...
...
common/SerializeCommonWordExcel.js
View file @
a7d62eb3
...
...
@@ -123,7 +123,7 @@ BinaryCommonWriter.prototype.WriteItem = function(type, fWrite)
this
.
memory
.
WriteByte
(
type
);
this
.
WriteItemWithLength
(
fWrite
);
};
BinaryCommonWriter
.
prototype
.
WriteItemStart
=
function
(
type
)
BinaryCommonWriter
.
prototype
.
WriteItemStart
=
function
(
type
,
fWrite
)
{
this
.
memory
.
WriteByte
(
type
);
return
this
.
WriteItemWithLengthStart
(
fWrite
);
...
...
common/apiCommon.js
View file @
a7d62eb3
...
...
@@ -37,6 +37,10 @@
* @param {undefined} undefined
*/
function
(
window
,
undefined
)
{
var
Asc
=
window
[
'
Asc
'
];
var
AscCommon
=
window
[
'
AscCommon
'
];
// Import
var
prot
;
var
c_oAscMouseMoveDataTypes
=
AscCommon
.
c_oAscMouseMoveDataTypes
;
...
...
@@ -1254,8 +1258,8 @@
this
.
Space
=
(
undefined
!=
obj
.
Space
)
?
obj
.
Space
:
null
;
}
else
{
this
.
Color
=
CreateAscColorCustom
(
0
,
0
,
0
);
this
.
Size
=
0.5
*
AscCommonWord
.
g_dKoef_pt_to_mm
;
this
.
Value
=
AscCommonWord
.
border_Single
;
this
.
Size
=
0.5
*
window
[
"
AscCommonWord
"
]
.
g_dKoef_pt_to_mm
;
this
.
Value
=
window
[
"
AscCommonWord
"
]
.
border_Single
;
this
.
Space
=
0
;
}
}
...
...
@@ -1664,7 +1668,7 @@
this
.
Brd
=
(
undefined
!=
obj
.
Brd
&&
null
!=
obj
.
Brd
)
?
new
asc_CParagraphBorders
(
obj
.
Brd
)
:
null
;
this
.
Shd
=
(
undefined
!=
obj
.
Shd
&&
null
!=
obj
.
Shd
)
?
new
asc_CParagraphShd
(
obj
.
Shd
)
:
null
;
this
.
Tabs
=
(
undefined
!=
obj
.
Tabs
)
?
new
asc_CParagraphTabs
(
obj
.
Tabs
)
:
undefined
;
this
.
DefaultTab
=
AscCommonWord
.
Default_Tab_Stop
;
this
.
DefaultTab
=
window
[
"
AscCommonWord
"
]
.
Default_Tab_Stop
;
this
.
Locked
=
(
undefined
!=
obj
.
Locked
&&
null
!=
obj
.
Locked
)
?
obj
.
Locked
:
false
;
this
.
CanAddTable
=
(
undefined
!=
obj
.
CanAddTable
)
?
obj
.
CanAddTable
:
true
;
...
...
@@ -2427,7 +2431,7 @@
},
asc_getOriginSize
:
function
(
api
)
{
if
(
AscFormat
.
isRealNumber
(
this
.
oleWidth
)
&&
AscFormat
.
isRealNumber
(
this
.
oleHeight
))
{
if
(
window
[
'
AscFormat
'
].
isRealNumber
(
this
.
oleWidth
)
&&
window
[
'
AscFormat
'
]
.
isRealNumber
(
this
.
oleHeight
))
{
return
new
asc_CImageSize
(
this
.
oleWidth
,
this
.
oleHeight
,
true
);
}
var
_section_select
=
api
.
WordControl
.
m_oLogicDocument
.
Get_PageSizesByDrawingObjects
();
...
...
@@ -2449,7 +2453,7 @@
}
var
_image
=
api
.
ImageLoader
.
map_image_index
[
AscCommon
.
getFullImageSrc2
(
this
.
ImageUrl
)];
if
(
_image
!=
undefined
&&
_image
.
Image
!=
null
&&
_image
.
Status
==
AscFonts
.
ImageLoadStatus
.
Complete
)
{
if
(
_image
!=
undefined
&&
_image
.
Image
!=
null
&&
_image
.
Status
==
window
[
'
AscFonts
'
]
.
ImageLoadStatus
.
Complete
)
{
var
_w
=
Math
.
max
(
1
,
_page_width
-
(
_page_x_left_margin
+
_page_x_right_margin
));
var
_h
=
Math
.
max
(
1
,
_page_height
-
(
_page_y_top_margin
+
_page_y_bottom_margin
));
...
...
common/docscoapi.js
View file @
a7d62eb3
...
...
@@ -35,6 +35,9 @@
(
function
(
window
,
undefined
)
{
'
use strict
'
;
var
Asc
=
window
[
'
Asc
'
];
var
AscCommon
=
window
[
'
AscCommon
'
];
var
ConnectionState
=
AscCommon
.
ConnectionState
;
var
c_oEditorId
=
AscCommon
.
c_oEditorId
;
var
c_oCloseCode
=
AscCommon
.
c_oCloseCode
;
...
...
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