Commit 3a4c82ce authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

правка бага 21407 - Не сбрасывается выделение комментария при клике на другой комментарий

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@50783 954022d7-b5bf-4e40-9824-e11837661b57
parent 4755586b
......@@ -6762,12 +6762,17 @@ CPresentation.prototype =
if(this.Document_Is_SelectionLocked(changestype_AddComment) === false)
{
History.Create_NewPoint();
for(var i = this.Slides[this.CurPage].comments.length - 1; i > -1; --i)
{
this.Slides[this.CurPage].comments[i].selected = false;
}
var Comment = new CComment( this.Comments, CommentData );
Comment.selected = true;
Comment.setPosition(this.Slides[this.CurPage].commentX, this.Slides[this.CurPage].commentY);
this.Slides[this.CurPage].commentX += COMMENT_WIDTH;
this.Slides[this.CurPage].commentY += COMMENT_HEIGHT;
this.Slides[this.CurPage].addComment(Comment);
this.DrawingDocument.OnRecalculatePage(this.CurPage, this.Slides[this.CurPage]);
this.DrawingDocument.OnEndRecalculate();
return Comment;
......
......@@ -58,6 +58,10 @@ function NullState(drawingObjectsController, drawingObjects)
{
this.drawingObjectsController.hideComment();
for(var i = drawingObjects.comments.length - 1; i > -1; --i)
{
drawingObjects.comments[i].selected = false;
}
for(var i = drawingObjects.comments.length - 1; i > -1; --i)
{
if(drawingObjects.comments[i].hit(x, y))
{
......@@ -69,10 +73,6 @@ function NullState(drawingObjectsController, drawingObjects)
return;
}
}
for(var i = drawingObjects.comments.length - 1; i > -1; --i)
{
drawingObjects.comments[i].selected = false;
}
var selected_objects = this.drawingObjectsController.selectedObjects;
if(selected_objects.length === 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