Commit 541b8b15 authored by Sergey Luzyanin's avatar Sergey Luzyanin

chart's selection for mobile version

parent 9be565ae
...@@ -326,11 +326,11 @@ function handleGroup(drawing, drawingObjectsController, e, x, y, group, pageInde ...@@ -326,11 +326,11 @@ function handleGroup(drawing, drawingObjectsController, e, x, y, group, pageInde
function handleInternalChart(drawing, drawingObjectsController, e, x, y, group, pageIndex, bWord) function handleInternalChart(drawing, drawingObjectsController, e, x, y, group, pageIndex, bWord)
{ {
var ret = false, i, title; 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 selector = group ? group : drawingObjectsController;
var legend = drawing.getLegend(); 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) if(drawing.selection.legend != legend)
{ {
...@@ -394,11 +394,11 @@ function handleInternalChart(drawing, drawingObjectsController, e, x, y, group, ...@@ -394,11 +394,11 @@ function handleInternalChart(drawing, drawingObjectsController, e, x, y, group,
var oLabels; var oLabels;
var arrLabels = []; 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); 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); arrLabels.push(drawing.chart.plotArea.valAx.labels);
} }
...@@ -425,7 +425,7 @@ function handleInternalChart(drawing, drawingObjectsController, e, x, y, group, ...@@ -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 series = drawing.chart.plotArea.chart.series;
var _len = drawing.chart.plotArea.chart.getObjectType() === AscDFH.historyitem_type_PieChart ? 1 : series.length; 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, ...@@ -473,7 +473,7 @@ function handleInternalChart(drawing, drawingObjectsController, e, x, y, group,
var hit_in_inner_area = title.hitInInnerArea(x, y); var hit_in_inner_area = title.hitInInnerArea(x, y);
var hit_in_path = title.hitInPath(x, y); var hit_in_path = title.hitInPath(x, y);
var hit_in_text_rect = title.hitInTextRect(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) if(drawingObjectsController.handleEventMode === HANDLE_EVENT_MODE_HANDLE)
{ {
......
...@@ -577,6 +577,9 @@ CChartSpace.prototype.drawSelect = function(drawingDocument, nPageIndex) ...@@ -577,6 +577,9 @@ CChartSpace.prototype.drawSelect = function(drawingDocument, nPageIndex)
if(this.selectStartPage === nPageIndex) if(this.selectStartPage === nPageIndex)
{ {
drawingDocument.DrawTrack(AscFormat.TYPE_TRACK.SHAPE, this.getTransformMatrix(), 0, 0, this.extX, this.extY, false, this.canRotate()); 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) 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); drawingDocument.DrawTrack(AscFormat.TYPE_TRACK.CHART_TEXT, this.selection.textSelection.transform, 0, 0, this.selection.textSelection.extX, this.selection.textSelection.extY, false, false, false);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment