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
e9734844
Commit
e9734844
authored
May 04, 2017
by
Oleg Korshul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
6d962b95
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
55 deletions
+4
-55
common/Charts/ChartsDrawer.js
common/Charts/ChartsDrawer.js
+0
-51
common/text_input.js
common/text_input.js
+2
-2
word/Local/documentrenderer.js
word/Local/documentrenderer.js
+2
-2
No files found.
common/Charts/ChartsDrawer.js
View file @
e9734844
...
...
@@ -13631,11 +13631,6 @@ CGeometry2.prototype =
return
false
;
},
getObjectType
:
function
()
{
return
CLASS_TYPE_GEOMETRY
;
},
AddPath
:
function
(
path
)
{
this
.
pathLst
.
push
(
path
);
...
...
@@ -13903,52 +13898,6 @@ CSortFaces.prototype =
return
{
intersections
:
intersections
,
reverseIntersections
:
reverseIntersections
,
countIntersection
:
countIntersection
};
},
sortFaces
:
function
(
faces
)
{
var
t
=
this
;
var
iterCount
=
0
;
var
newArr
=
[];
var
lastFaces
=
faces
;
while
(
lastFaces
.
length
!==
0
)
{
var
firstFaces1
=
[],
lastFaces1
=
[];
t
.
_getFirstLastFaces
(
lastFaces
,
firstFaces1
,
lastFaces1
);
newArr
=
firstFaces1
.
concat
(
newArr
);
lastFaces
=
lastFaces1
;
iterCount
++
;
if
(
iterCount
>
50
)
{
newArr
=
lastFaces
.
concat
(
newArr
);
break
;
}
}
return
newArr
;
},
_getFirstLastFaces
:
function
(
sortZIndexPaths
,
first
,
last
)
{
//перебираем все грани
for
(
var
i
=
0
;
i
<
all
.
length
;
i
++
)
{
var
plainVerge
=
all
[
i
];
var
isFirstVerge
=
this
.
_isIntersectionFacesPointLines
(
plainVerge
,
i
,
all
);
//push into array
if
(
!
isFirstVerge
)
{
first
.
push
(
plainVerge
);
}
else
{
last
.
push
(
plainVerge
);
}
}
},
//смотрим есть ли пересечения точек, выходящих из вершин данной грани, с другими гранями
_isIntersectionFacesPointLines
:
function
(
plainVerge
,
i
,
sortZIndexPaths
)
{
...
...
common/text_input.js
View file @
e9734844
...
...
@@ -416,8 +416,8 @@
{
if
(
this
.
Api
.
asc_IsFocus
()
&&
!
AscCommon
.
g_clipboardBase
.
IsFocus
()
&&
!
AscCommon
.
g_clipboardBase
.
IsWorking
())
{
if
(
document
.
activeElement
!=
oT
his
.
HtmlArea
)
oT
his
.
HtmlArea
.
focus
();
if
(
document
.
activeElement
!=
t
his
.
HtmlArea
)
t
his
.
HtmlArea
.
focus
();
}
},
...
...
word/Local/documentrenderer.js
View file @
e9734844
...
...
@@ -176,7 +176,7 @@ CDocMeta.prototype.selectAllCheckStart = function()
}
this
.
waitSelectAll
=
true
;
editor
.
sync_StartAction
(
c_oAscAsyncActionType
.
BlockInteraction
,
c_oAscAsyncAction
.
SlowOperation
);
editor
.
sync_StartAction
(
window
[
'
Asc
'
].
c_oAscAsyncActionType
.
BlockInteraction
,
window
[
'
Asc
'
].
c_oAscAsyncAction
.
SlowOperation
);
};
CDocMeta
.
prototype
.
selectAllCheckEnd
=
function
()
...
...
@@ -184,7 +184,7 @@ CDocMeta.prototype.selectAllCheckEnd = function()
if
(
this
.
waitSelectAll
)
{
this
.
waitSelectAll
=
false
;
editor
.
sync_EndAction
(
c_oAscAsyncActionType
.
BlockInteraction
,
c_oAscAsyncAction
.
SlowOperation
);
editor
.
sync_EndAction
(
window
[
'
Asc
'
].
c_oAscAsyncActionType
.
BlockInteraction
,
window
[
'
Asc
'
].
c_oAscAsyncAction
.
SlowOperation
);
this
.
selectAll
();
}
};
\ No newline at end of file
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