Commit 26c854d6 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

Bug 30002 - [TextArt] Js ошибка после drag&drop символа внутри text art на пустое место

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64019 954022d7-b5bf-4e40-9824-e11837661b57
parent 9f07e681
......@@ -5020,9 +5020,9 @@ DrawingObjectsController.prototype =
return bRet;
},
resetSelection: function(noResetContentSelect)
resetSelection: function(noResetContentSelect, bNoCheckChart)
{
if(this.document)
if(this.document && bNoCheckChart !== true)
{
this.checkChartTextSelection();
}
......
......@@ -8005,11 +8005,11 @@ CDocument.prototype =
},
// Убираем селект
Selection_Remove : function()
Selection_Remove : function(bNoCheckDrawing)
{
if ( docpostype_HdrFtr === this.CurPos.Type )
{
return this.HdrFtr.Selection_Remove();
return this.HdrFtr.Selection_Remove(bNoCheckDrawing);
}
else if ( docpostype_DrawingObjects === this.CurPos.Type )
{
......@@ -8018,7 +8018,7 @@ CDocument.prototype =
{
ParaDrawing.GoTo_Text(undefined, false);
}
return this.DrawingObjects.resetSelection();
return this.DrawingObjects.resetSelection(undefined, bNoCheckDrawing);
}
else if ( docpostype_Content === this.CurPos.Type )
{
......@@ -8894,7 +8894,7 @@ CDocument.prototype =
}
}
this.Selection_Remove();
this.Selection_Remove(true);
// Выделение выставляется внутри функции Insert_Content
Para.Parent.Insert_Content( DocContent, NearPos );
......
......@@ -7147,11 +7147,11 @@ CDocumentContent.prototype =
// Функции для работы с селектом
//-----------------------------------------------------------------------------------
// Убираем селект
Selection_Remove : function()
Selection_Remove : function(bNoCheckDrawing)
{
if ( docpostype_DrawingObjects === this.CurPos.Type )
{
return this.LogicDocument.DrawingObjects.resetSelection();
return this.LogicDocument.DrawingObjects.resetSelection(undefined, bNoCheckDrawing);
}
else //if ( docpostype_Content === this.CurPos.Type )
{
......
......@@ -858,9 +858,9 @@ CHeaderFooter.prototype =
},
// Убираем селект
Selection_Remove : function()
Selection_Remove : function(bNoCheckDrawing)
{
return this.Content.Selection_Remove();
return this.Content.Selection_Remove(bNoCheckDrawing);
},
// Рисуем селект
......@@ -1899,10 +1899,10 @@ CHeaderFooterController.prototype =
},
// Убираем селект
Selection_Remove : function()
Selection_Remove : function(bNoCheckDrawing)
{
if ( null != this.CurHdrFtr )
return this.CurHdrFtr.Selection_Remove();
return this.CurHdrFtr.Selection_Remove(bNoCheckDrawing);
},
// Рисуем селект
......
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