Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix Bug 47533

Browse source
This commit is contained in:
Julia Radzhabova 2020-11-18 15:28:47 +03:00
parent 7946d762a7
commit 525a0a4aec
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/common/main/lib/controller/Comments.js
View file

@ -291,7 +291,7 @@ define([
return false; return false;
}, },
onShowComment: function (id, selected) { onShowComment: function (id, selected, fromLeftPanelSelection) {
var comment = this.findComment(id); var comment = this.findComment(id);
if (comment) { if (comment) {
if (null !== comment.get('quote')) { if (null !== comment.get('quote')) {
@ -319,9 +319,11 @@ define([
this.isSelectedComment = selected; this.isSelectedComment = selected;
} }
this.api.asc_selectComment(id); if (!fromLeftPanelSelection || !((0 === _.difference(this.uids, [id]).length) && (0 === _.difference([id], this.uids).length))) {
this._dontScrollToComment = true; this.api.asc_selectComment(id);
this.api.asc_showComment(id,false); this._dontScrollToComment = true;
this.api.asc_showComment(id,false);
}
} }
} else { } else {

11
apps/common/main/lib/view/Comments.js
View file

@ -283,7 +283,16 @@ define([
} else if (!btn.hasClass('msg-reply') && } else if (!btn.hasClass('msg-reply') &&
!btn.hasClass('btn-resolve-check') && !btn.hasClass('btn-resolve-check') &&
!btn.hasClass('btn-resolve')) { !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]);
} }
} }
}, },