Commit becd2bb6 authored by Ilya.Kirillov's avatar Ilya.Kirillov Committed by Alexander.Trofimov

Сделано возможным добавить гиперссылку, когда выделен знак параграфа (баг 13609).

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@55153 954022d7-b5bf-4e40-9824-e11837661b57
parent f261cb2b
......@@ -8415,7 +8415,7 @@ CDocumentContent.prototype =
var bFlag = false;
var Pos = 0;
// Найдем элемент с Id = CurId
var Count = this.Content.length;
for ( Pos = 0; Pos < Count; Pos++ )
......
......@@ -12867,6 +12867,13 @@ Paragraph.prototype =
var StartPos = StartContentPos.Get(0);
var EndPos = EndContentPos.Get(0);
// TODO: Как только избавимся от ParaEnd, здесь надо будет переделать.
if ( this.Content.length - 1 === EndPos && true === this.Selection_CheckParaEnd() )
{
EndContentPos = this.Get_EndPos( false );
EndPos = EndContentPos.Get(0);
}
var NewElementE = this.Content[EndPos].Split( EndContentPos, 1 );
var NewElementS = this.Content[StartPos].Split( StartContentPos, 1 );
......@@ -13382,7 +13389,7 @@ Paragraph.prototype =
for ( var CurPos = StartPos; CurPos <= EndPos; CurPos++ )
{
var Element = this.Content[CurPos];
if ( para_Hyperlink === Element.Type || true === Element.Selection_CheckParaEnd() )
if ( para_Hyperlink === Element.Type /*|| true === Element.Selection_CheckParaEnd()*/ )
return false;
}
......@@ -13417,7 +13424,7 @@ Paragraph.prototype =
for ( var CurPos = StartPos; CurPos <= EndPos; CurPos++ )
{
var Element = this.Content[CurPos];
if ( (true === bHyper && para_Hyperlink === Element.Type) || true === Element.Selection_CheckParaEnd() )
if ( (true === bHyper && para_Hyperlink === Element.Type) /*|| true === Element.Selection_CheckParaEnd()*/ )
return false;
else if ( true !== bHyper && para_Hyperlink === Element.Type )
bHyper = true;
......
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