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
541b8b15
Commit
541b8b15
authored
Jul 04, 2016
by
Sergey Luzyanin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chart's selection for mobile version
parent
9be565ae
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
6 deletions
+9
-6
common/Drawings/DrawingObjectsHandlers.js
common/Drawings/DrawingObjectsHandlers.js
+6
-6
common/Drawings/Format/ChartSpace.js
common/Drawings/Format/ChartSpace.js
+3
-0
No files found.
common/Drawings/DrawingObjectsHandlers.js
View file @
541b8b15
...
...
@@ -326,11 +326,11 @@ function handleGroup(drawing, drawingObjectsController, e, x, y, group, pageInde
function
handleInternalChart
(
drawing
,
drawingObjectsController
,
e
,
x
,
y
,
group
,
pageIndex
,
bWord
)
{
var
ret
=
false
,
i
,
title
;
if
(
drawing
.
hit
(
x
,
y
)
&&
!
window
[
"
NATIVE_EDITOR_ENJINE
"
]
)
if
(
drawing
.
hit
(
x
,
y
))
{
var
selector
=
group
?
group
:
drawingObjectsController
;
var
legend
=
drawing
.
getLegend
();
if
(
legend
&&
legend
.
hit
(
x
,
y
))
if
(
legend
&&
!
window
[
"
NATIVE_EDITOR_ENJINE
"
]
&&
legend
.
hit
(
x
,
y
))
{
if
(
drawing
.
selection
.
legend
!=
legend
)
{
...
...
@@ -394,11 +394,11 @@ function handleInternalChart(drawing, drawingObjectsController, e, x, y, group,
var
oLabels
;
var
arrLabels
=
[];
if
(
drawing
.
chart
.
plotArea
.
catAx
&&
drawing
.
chart
.
plotArea
.
catAx
.
labels
)
if
(
drawing
.
chart
.
plotArea
.
catAx
&&
drawing
.
chart
.
plotArea
.
catAx
.
labels
&&
!
window
[
"
NATIVE_EDITOR_ENJINE
"
]
)
{
arrLabels
.
push
(
drawing
.
chart
.
plotArea
.
catAx
.
labels
);
}
if
(
drawing
.
chart
.
plotArea
.
valAx
&&
drawing
.
chart
.
plotArea
.
valAx
.
labels
)
if
(
drawing
.
chart
.
plotArea
.
valAx
&&
drawing
.
chart
.
plotArea
.
valAx
.
labels
&&
!
window
[
"
NATIVE_EDITOR_ENJINE
"
]
)
{
arrLabels
.
push
(
drawing
.
chart
.
plotArea
.
valAx
.
labels
);
}
...
...
@@ -425,7 +425,7 @@ function handleInternalChart(drawing, drawingObjectsController, e, x, y, group,
}
}
if
(
drawing
.
chart
.
plotArea
.
chart
&&
drawing
.
chart
.
plotArea
.
chart
.
series
)
if
(
drawing
.
chart
.
plotArea
.
chart
&&
drawing
.
chart
.
plotArea
.
chart
.
series
&&
!
window
[
"
NATIVE_EDITOR_ENJINE
"
]
)
{
var
series
=
drawing
.
chart
.
plotArea
.
chart
.
series
;
var
_len
=
drawing
.
chart
.
plotArea
.
chart
.
getObjectType
()
===
AscDFH
.
historyitem_type_PieChart
?
1
:
series
.
length
;
...
...
@@ -473,7 +473,7 @@ function handleInternalChart(drawing, drawingObjectsController, e, x, y, group,
var
hit_in_inner_area
=
title
.
hitInInnerArea
(
x
,
y
);
var
hit_in_path
=
title
.
hitInPath
(
x
,
y
);
var
hit_in_text_rect
=
title
.
hitInTextRect
(
x
,
y
);
if
(
hit_in_inner_area
&&
(
!
hit_in_text_rect
||
drawing
.
selection
.
title
!==
title
)
||
hit_in_path
)
if
(
(
hit_in_inner_area
&&
(
!
hit_in_text_rect
||
drawing
.
selection
.
title
!==
title
)
||
hit_in_path
)
&&
!
window
[
"
NATIVE_EDITOR_ENJINE
"
]
)
{
if
(
drawingObjectsController
.
handleEventMode
===
HANDLE_EVENT_MODE_HANDLE
)
{
...
...
common/Drawings/Format/ChartSpace.js
View file @
541b8b15
...
...
@@ -577,6 +577,9 @@ CChartSpace.prototype.drawSelect = function(drawingDocument, nPageIndex)
if
(
this
.
selectStartPage
===
nPageIndex
)
{
drawingDocument
.
DrawTrack
(
AscFormat
.
TYPE_TRACK
.
SHAPE
,
this
.
getTransformMatrix
(),
0
,
0
,
this
.
extX
,
this
.
extY
,
false
,
this
.
canRotate
());
if
(
window
[
"
NATIVE_EDITOR_ENJINE
"
]){
return
;
}
if
(
this
.
selection
.
textSelection
)
{
drawingDocument
.
DrawTrack
(
AscFormat
.
TYPE_TRACK
.
CHART_TEXT
,
this
.
selection
.
textSelection
.
transform
,
0
,
0
,
this
.
selection
.
textSelection
.
extX
,
this
.
selection
.
textSelection
.
extY
,
false
,
false
,
false
);
...
...
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