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

Исправлен баг с выставлением селекта при отмене нумерации, когда выделена сама...

Исправлен баг с выставлением селекта при отмене нумерации, когда выделена сама нумерация (баг 27252). Исправлен баг с постановкой курсора после удаления (баг 27246).

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59323 954022d7-b5bf-4e40-9824-e11837661b57
parent 86ba15e4
...@@ -824,6 +824,7 @@ CDocument.prototype = ...@@ -824,6 +824,7 @@ CDocument.prototype =
if ( true === this.Content[ContentPos].Is_SelectionUse() ) if ( true === this.Content[ContentPos].Is_SelectionUse() )
{ {
this.Selection.Flag = selectionflag_Common;
this.Selection.Use = true; this.Selection.Use = true;
this.Selection.StartPos = ContentPos; this.Selection.StartPos = ContentPos;
this.Selection.EndPos = ContentPos; this.Selection.EndPos = ContentPos;
......
...@@ -2296,7 +2296,6 @@ Paragraph.prototype = ...@@ -2296,7 +2296,6 @@ Paragraph.prototype =
this.CurPos.ContentPos = EndPos; this.CurPos.ContentPos = EndPos;
this.Content[EndPos].Cursor_MoveToStartPos(); this.Content[EndPos].Cursor_MoveToStartPos();
this.Correct_ContentPos2();
} }
this.Internal_Content_Remove2( StartPos + 1, EndPos - StartPos - 1 ); this.Internal_Content_Remove2( StartPos + 1, EndPos - StartPos - 1 );
...@@ -2312,6 +2311,8 @@ Paragraph.prototype = ...@@ -2312,6 +2311,8 @@ Paragraph.prototype =
this.Internal_Content_Remove( StartPos ); this.Internal_Content_Remove( StartPos );
} }
this.Correct_ContentPos2();
this.DeleteCommentOnRemove = true; this.DeleteCommentOnRemove = true;
for (var CommentId in CommentsToDelete) for (var CommentId in CommentsToDelete)
......
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