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
c1e93539
Commit
c1e93539
authored
Mar 10, 2017
by
Ilya Kirillov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed problem with determining the hit of the cursor in the select in headers and shapes.
parent
b0d686c3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
14 deletions
+14
-14
common/Drawings/Format/Shape.js
common/Drawings/Format/Shape.js
+3
-3
word/Editor/HeaderFooter.js
word/Editor/HeaderFooter.js
+11
-11
No files found.
common/Drawings/Format/Shape.js
View file @
c1e93539
...
@@ -2236,17 +2236,17 @@ CShape.prototype.setWordShape = function (pr) {
...
@@ -2236,17 +2236,17 @@ CShape.prototype.setWordShape = function (pr) {
this
.
bWordShape
=
pr
;
this
.
bWordShape
=
pr
;
};
};
CShape
.
prototype
.
selectionCheck
=
function
(
X
,
Y
,
Page
_
Abs
,
NearPos
)
{
CShape
.
prototype
.
selectionCheck
=
function
(
X
,
Y
,
PageAbs
,
NearPos
)
{
var
content
=
this
.
getDocContent
();
var
content
=
this
.
getDocContent
();
if
(
content
)
{
if
(
content
)
{
if
(
undefined
!==
NearPos
)
if
(
undefined
!==
NearPos
)
return
content
.
Selection_Check
(
X
,
Y
,
Page_Abs
,
NearPos
);
return
content
.
Selection_Check
(
X
,
Y
,
0
,
NearPos
);
if
(
isRealObject
(
content
)
&&
this
.
hitInTextRect
(
X
,
Y
)
&&
this
.
invertTransformText
)
{
if
(
isRealObject
(
content
)
&&
this
.
hitInTextRect
(
X
,
Y
)
&&
this
.
invertTransformText
)
{
var
t_x
=
this
.
invertTransformText
.
TransformPointX
(
X
,
Y
);
var
t_x
=
this
.
invertTransformText
.
TransformPointX
(
X
,
Y
);
var
t_y
=
this
.
invertTransformText
.
TransformPointY
(
X
,
Y
);
var
t_y
=
this
.
invertTransformText
.
TransformPointY
(
X
,
Y
);
return
content
.
Selection_Check
(
t_x
,
t_y
,
Page_Abs
,
NearPos
);
return
content
.
Selection_Check
(
t_x
,
t_y
,
0
,
NearPos
);
}
}
}
}
return
false
;
return
false
;
...
...
word/Editor/HeaderFooter.js
View file @
c1e93539
...
@@ -961,14 +961,14 @@ CHeaderFooter.prototype =
...
@@ -961,14 +961,14 @@ CHeaderFooter.prototype =
return
this
.
Content
.
Selection_Is_TableBorderMove
();
return
this
.
Content
.
Selection_Is_TableBorderMove
();
},
},
Selection_Check
:
function
(
X
,
Y
,
Page_
Abs
,
NearPos
)
Selection_Check
:
function
(
X
,
Y
,
Page
Abs
,
NearPos
)
{
{
if
(
-
1
===
this
.
RecalcInfo
.
CurPage
)
if
(
-
1
===
this
.
RecalcInfo
.
CurPage
)
return
false
;
return
false
;
var
HdrFtrPage
=
this
.
Content
.
Get_StartPage_Absolute
();
var
HdrFtrPage
=
this
.
Content
.
Get_StartPage_Absolute
();
if
(
undefined
!==
NearPos
||
HdrFtrPage
===
Page_Abs
)
if
(
undefined
!==
NearPos
||
HdrFtrPage
===
PageAbs
)
return
this
.
Content
.
Selection_Check
(
X
,
Y
,
Page_Abs
,
NearPos
);
return
this
.
Content
.
Selection_Check
(
X
,
Y
,
0
,
NearPos
);
return
false
;
return
false
;
},
},
...
@@ -2277,10 +2277,10 @@ CHeaderFooterController.prototype =
...
@@ -2277,10 +2277,10 @@ CHeaderFooterController.prototype =
return
false
;
return
false
;
},
},
Selection_Check
:
function
(
X
,
Y
,
Page
_
Abs
,
NearPos
)
Selection_Check
:
function
(
X
,
Y
,
PageAbs
,
NearPos
)
{
{
if
(
null
!=
this
.
CurHdrFtr
)
if
(
null
!=
this
.
CurHdrFtr
)
return
this
.
CurHdrFtr
.
Selection_Check
(
X
,
Y
,
0
,
NearPos
);
return
this
.
CurHdrFtr
.
Selection_Check
(
X
,
Y
,
PageAbs
,
NearPos
);
},
},
Selection_IsEmpty
:
function
(
bCheckHidden
)
Selection_IsEmpty
:
function
(
bCheckHidden
)
...
...
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