Commit 83628cc5 authored by Sergey Luzyanin's avatar Sergey Luzyanin

added flag bText to isPointInDrawingObjects3

parent 7539e1a6
......@@ -1259,7 +1259,7 @@ DrawingObjectsController.prototype =
isPointInDrawingObjects3: function(x, y, nPageIndex, bSelected)
isPointInDrawingObjects3: function(x, y, nPageIndex, bSelected, bText)
{
var oOldState = this.curState;
this.changeCurrentState(new AscFormat.NullState(this));
......@@ -1279,6 +1279,11 @@ DrawingObjectsController.prototype =
return false;
}
}
else{
if(bText){
return true;
}
}
}
this.changeCurrentState(oOldState);
return bRet;
......
......@@ -2897,8 +2897,21 @@ CGraphicObjects.prototype =
return this.isPointInDrawingObjects(x, y, pageIndex, bSelected, true) > -1;
},
isPointInDrawingObjects3: function(x, y, pageIndex, bSelected)
{
isPointInDrawingObjects3: function(x, y, pageIndex, bSelected, bText)
{
if(bText){
var ret;
this.handleEventMode = HANDLE_EVENT_MODE_CURSOR;
ret = this.curState.onMouseDown(global_mouseEvent, x, y, pageIndex);
this.handleEventMode = HANDLE_EVENT_MODE_HANDLE;
if(isRealObject(ret)){
if(ret.cursorType === "text")
{
return true;
}
}
return false;
}
var oOldState = this.curState;
this.changeCurrentState(new AscFormat.NullState(this));
var bRet = this.isPointInDrawingObjects(x, y, pageIndex, bSelected, true) > -1;
......
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