From 525a0a4aec6ea19ee6aeead97eef7f8179c25854 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 18 Nov 2020 15:28:47 +0300 Subject: [PATCH] Fix Bug 47533 --- apps/common/main/lib/controller/Comments.js | 10 ++++++---- apps/common/main/lib/view/Comments.js | 11 ++++++++++- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/apps/common/main/lib/controller/Comments.js b/apps/common/main/lib/controller/Comments.js index 660d60bba..559792187 100644 --- a/apps/common/main/lib/controller/Comments.js +++ b/apps/common/main/lib/controller/Comments.js @@ -291,7 +291,7 @@ define([ return false; }, - onShowComment: function (id, selected) { + onShowComment: function (id, selected, fromLeftPanelSelection) { var comment = this.findComment(id); if (comment) { if (null !== comment.get('quote')) { @@ -319,9 +319,11 @@ define([ this.isSelectedComment = selected; } - this.api.asc_selectComment(id); - this._dontScrollToComment = true; - this.api.asc_showComment(id,false); + if (!fromLeftPanelSelection || !((0 === _.difference(this.uids, [id]).length) && (0 === _.difference([id], this.uids).length))) { + this.api.asc_selectComment(id); + this._dontScrollToComment = true; + this.api.asc_showComment(id,false); + } } } else { diff --git a/apps/common/main/lib/view/Comments.js b/apps/common/main/lib/view/Comments.js index 4c77e66bd..bc5bc47f1 100644 --- a/apps/common/main/lib/view/Comments.js +++ b/apps/common/main/lib/view/Comments.js @@ -283,7 +283,16 @@ define([ } else if (!btn.hasClass('msg-reply') && !btn.hasClass('btn-resolve-check') && !btn.hasClass('btn-resolve')) { - me.fireEvent('comment:show', [commentId, false]); + var isTextSelected = false; + if (btn.hasClass('user-message')) { + if (window.getSelection) { + var selection = window.getSelection(); + isTextSelected = (selection.toString()!=='') + } else if (document.selection) { + isTextSelected = document.selection; + } + } + me.fireEvent('comment:show', [commentId, false, isTextSelected]); } } },