Commit dc79f188 authored by Sergey Luzyanin's avatar Sergey Luzyanin

improve work with chart's titles in mobile version

parent a307ad4e
...@@ -86,6 +86,14 @@ function handleSelectedObjects(drawingObjectsController, e, x, y, group, pageInd ...@@ -86,6 +86,14 @@ function handleSelectedObjects(drawingObjectsController, e, x, y, group, pageInd
tx = x; tx = x;
ty = y; ty = y;
} }
if(selected_objects[i].getObjectType() === AscDFH.historyitem_type_ChartSpace)
{
var oRet = handleInternalChart(selected_objects[i], drawingObjectsController, e, x, y, group, pageIndex, bWord);
if(oRet){
return oRet;
}
}
var hit_to_handles = selected_objects[i].hitToHandles(tx, ty); var hit_to_handles = selected_objects[i].hitToHandles(tx, ty);
if(hit_to_handles > -1) if(hit_to_handles > -1)
{ {
...@@ -106,6 +114,13 @@ function handleSelectedObjects(drawingObjectsController, e, x, y, group, pageInd ...@@ -106,6 +114,13 @@ function handleSelectedObjects(drawingObjectsController, e, x, y, group, pageInd
tx = x; tx = x;
ty = y; ty = y;
} }
if(selected_objects[i].getObjectType() === AscDFH.historyitem_type_ChartSpace)
{
var oRet = handleInternalChart(selected_objects[i], drawingObjectsController, e, x, y, group, pageIndex, bWord);
if(oRet){
return oRet;
}
}
if(selected_objects[i].hitInBoundingRect(tx, ty) && (!selected_objects[i].hitInTextRect || !selected_objects[i].hitInTextRect(tx, ty))) if(selected_objects[i].hitInBoundingRect(tx, ty) && (!selected_objects[i].hitInTextRect || !selected_objects[i].hitInTextRect(tx, ty)))
{ {
if(bWord && selected_objects[i].parent && selected_objects[i].parent.Is_Inline()) if(bWord && selected_objects[i].parent && selected_objects[i].parent.Is_Inline())
...@@ -471,13 +486,14 @@ function handleInternalChart(drawing, drawingObjectsController, e, x, y, group, ...@@ -471,13 +486,14 @@ function handleInternalChart(drawing, drawingObjectsController, e, x, y, group,
} }
var chart_titles = drawing.getAllTitles(); var chart_titles = drawing.getAllTitles();
var bIsMobileVersion = AscCommon.AscBrowser.isMobileVersion;
for(i = 0; i < chart_titles.length; ++i) for(i = 0; i < chart_titles.length; ++i)
{ {
title = chart_titles[i]; title = chart_titles[i];
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) && !window["NATIVE_EDITOR_ENJINE"]) if((hit_in_inner_area && (!hit_in_text_rect || drawing.selection.title !== title) || (hit_in_path && bIsMobileVersion !== true)) && !window["NATIVE_EDITOR_ENJINE"])
{ {
if(drawingObjectsController.handleEventMode === HANDLE_EVENT_MODE_HANDLE) if(drawingObjectsController.handleEventMode === HANDLE_EVENT_MODE_HANDLE)
{ {
......
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