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
deeaae2a
Commit
deeaae2a
authored
Oct 31, 2016
by
Alexey.Musinov
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of
https://github.com/ONLYOFFICE/sdkjs
into develop
parents
d110ed25
1d646ebe
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
107 additions
and
71 deletions
+107
-71
common/Charts/3DTransformation.js
common/Charts/3DTransformation.js
+4
-3
common/Charts/ChartsDrawer.js
common/Charts/ChartsDrawer.js
+98
-64
common/Drawings/CommonController.js
common/Drawings/CommonController.js
+1
-0
word/Editor/Serialize2.js
word/Editor/Serialize2.js
+4
-4
No files found.
common/Charts/3DTransformation.js
View file @
deeaae2a
...
...
@@ -184,8 +184,9 @@ Processor3D.prototype._recalculateScaleWithMaxWidth = function()
}
else
{
//если будут проблемы с поворотом standard диграмм, раскомментровать!
//TODO протестировать, и если не будет проблем, то убрать if-else
if
(
Math
.
abs
(
this
.
angleOy
)
>
Math
.
PI
)
/*
if(Math.abs(this.angleOy) > Math.PI)
{
//рассчитываем параметры диаграммы при оптимальной ширине
this.widthCanvas = optimalWidth + (this.left + this.right);
...
...
@@ -204,7 +205,7 @@ Processor3D.prototype._recalculateScaleWithMaxWidth = function()
this._recalculateCameraDiff();
}
else
{
{
*/
//рассчитываем параметры диаграммы при оптимальной ширине
this
.
widthCanvas
=
optimalWidth
+
(
this
.
left
+
this
.
right
);
var
scaleX
=
this
.
scaleX
;
...
...
@@ -242,7 +243,7 @@ Processor3D.prototype._recalculateScaleWithMaxWidth = function()
this
.
widthCanvas
=
widthCanvas
;
this
.
_recalculateCameraDiff
();
}
//
}
}
};
...
...
common/Charts/ChartsDrawer.js
View file @
deeaae2a
This diff is collapsed.
Click to expand it.
common/Drawings/CommonController.js
View file @
deeaae2a
...
...
@@ -5247,6 +5247,7 @@ DrawingObjectsController.prototype =
{
this
.
selectNextObject
(
!
e
.
shiftKey
?
1
:
-
1
);
}
bRetValue
=
true
;
}
else
if
(
e
.
keyCode
==
13
&&
false
===
isViewMode
)
// Enter
{
...
...
word/Editor/Serialize2.js
View file @
deeaae2a
...
...
@@ -2011,16 +2011,16 @@ function Binary_pPrWriter(memory, oNumIdMap, oBinaryHeaderFooterTableWriter, sav
if
(
null
!=
pageBorders
.
ZOrder
)
{
this
.
bs
.
WriteItem
(
c_oSerPageBorders
.
ZOrder
,
function
(){
oThis
.
memory
.
WriteByte
(
pageBorders
.
ZOrder
);});
}
if
(
null
!=
pageBorders
.
Bottom
)
{
if
(
null
!=
pageBorders
.
Bottom
&&
!
pageBorders
.
Bottom
.
IsNone
()
)
{
this
.
bs
.
WriteItem
(
c_oSerPageBorders
.
Bottom
,
function
(){
oThis
.
WritePgBorder
(
pageBorders
.
Bottom
);});
}
if
(
null
!=
pageBorders
.
Left
)
{
if
(
null
!=
pageBorders
.
Left
&&
!
pageBorders
.
Left
.
IsNone
()
)
{
this
.
bs
.
WriteItem
(
c_oSerPageBorders
.
Left
,
function
(){
oThis
.
WritePgBorder
(
pageBorders
.
Left
);});
}
if
(
null
!=
pageBorders
.
Right
)
{
if
(
null
!=
pageBorders
.
Right
&&
!
pageBorders
.
Right
.
IsNone
()
)
{
this
.
bs
.
WriteItem
(
c_oSerPageBorders
.
Right
,
function
(){
oThis
.
WritePgBorder
(
pageBorders
.
Right
);});
}
if
(
null
!=
pageBorders
.
Top
)
{
if
(
null
!=
pageBorders
.
Top
&&
!
pageBorders
.
Top
.
IsNone
()
)
{
this
.
bs
.
WriteItem
(
c_oSerPageBorders
.
Top
,
function
(){
oThis
.
WritePgBorder
(
pageBorders
.
Top
);});
}
}
...
...
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