Commit 67bbba1d authored by Sergey.Luzyanin's avatar Sergey.Luzyanin

Bug 30372 - [TextArt]Смещение рамки выделения после применения гиперссылки

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64720 954022d7-b5bf-4e40-9824-e11837661b57
parent e1c6a5d5
...@@ -1592,26 +1592,58 @@ DrawingObjectsController.prototype = ...@@ -1592,26 +1592,58 @@ DrawingObjectsController.prototype =
hyperlinkRemove: function() hyperlinkRemove: function()
{ {
var content = this.getTargetDocContent(true); var content = this.getTargetDocContent(true);
return content && content.Hyperlink_Remove(); if(content)
{
var Ret = content.Hyperlink_Remove();
var target_text_object = getTargetTextObject(this);
if(target_text_object)
{
target_text_object.checkExtentsByDocContent && target_text_object.checkExtentsByDocContent();
}
return Ret;
}
return undefined;
}, },
hyperlinkModify: function( HyperProps ) hyperlinkModify: function( HyperProps )
{ {
var content = this.getTargetDocContent(true); var content = this.getTargetDocContent(true);
return content && content.Hyperlink_Modify(HyperProps); if(content)
{
var Ret = content.Hyperlink_Modify(HyperProps);
var target_text_object = getTargetTextObject(this);
if(target_text_object)
{
target_text_object.checkExtentsByDocContent && target_text_object.checkExtentsByDocContent();
}
return Ret;
}
return undefined;
}, },
hyperlinkAdd: function( HyperProps ) hyperlinkAdd: function( HyperProps )
{ {
var content = this.getTargetDocContent(true); var content = this.getTargetDocContent(true), bCheckExtents = false;
if(content) if(content)
{ {
if(!this.document) if(!this.document)
{ {
if ( null != HyperProps.Text && "" != HyperProps.Text && true === content.Is_SelectionUse() ) if ( null != HyperProps.Text && "" != HyperProps.Text && true === content.Is_SelectionUse() )
this.removeCallback(-1); {
this.removeCallback(-1, undefined, undefined, true);
bCheckExtents = true;
}
}
var Ret = content.Hyperlink_Add(HyperProps);
if(bCheckExtents)
{
var target_text_object = getTargetTextObject(this);
if(target_text_object)
{
target_text_object.checkExtentsByDocContent && target_text_object.checkExtentsByDocContent();
}
} }
return content.Hyperlink_Add(HyperProps); return Ret;
} }
return null; return null;
}, },
...@@ -3778,7 +3810,7 @@ DrawingObjectsController.prototype = ...@@ -3778,7 +3810,7 @@ DrawingObjectsController.prototype =
this.checkSelectedObjectsAndCallback(this.removeCallback, [dir, bOnlyText, bRemoveOnlySelection], false, historydescription_Spreadsheet_Remove); this.checkSelectedObjectsAndCallback(this.removeCallback, [dir, bOnlyText, bRemoveOnlySelection], false, historydescription_Spreadsheet_Remove);
}, },
removeCallback: function(dir, bOnlyText, bRemoveOnlySelection) removeCallback: function(dir, bOnlyText, bRemoveOnlySelection, bNoCheck)
{ {
var target_text_object = getTargetTextObject(this); var target_text_object = getTargetTextObject(this);
if(target_text_object) if(target_text_object)
...@@ -3795,7 +3827,7 @@ DrawingObjectsController.prototype = ...@@ -3795,7 +3827,7 @@ DrawingObjectsController.prototype =
content.Remove(dir, true, bRemoveOnlySelection) content.Remove(dir, true, bRemoveOnlySelection)
} }
target_text_object.checkExtentsByDocContent && target_text_object.checkExtentsByDocContent(); bNoCheck !== true && target_text_object.checkExtentsByDocContent && target_text_object.checkExtentsByDocContent();
} }
} }
else if(this.selectedObjects.length > 0) else if(this.selectedObjects.length > 0)
......
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