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

Fix Bug 49936 (fix rev.6d121415f237d096a3fe7354068c0d25f8622956)

Browse source
This commit is contained in:
Julia Radzhabova 2021-04-25 00:12:37 +03:00
parent b634b638c5
commit b354296c71
2 changed files with 5 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -272,16 +272,8 @@ define([
me.fireEvent('comment:resolve', [commentId]);
readdresolves();
} else if (btn.hasClass('btn-resolve-check', false)) {
var tip = btn.data('bs.tooltip');
if (tip) tip.dontShow = true;
me.fireEvent('comment:resolve', [commentId]);
readdresolves();
} else if (!btn.hasClass('msg-reply') &&
!btn.hasClass('btn-resolve-check') &&
!btn.hasClass('btn-resolve')) {
var isTextSelected = false;
if (btn.hasClass('user-message')) {
@ -377,12 +369,12 @@ define([
}
var arr = [],
btns = $(view.el).find('.btn-resolve');
btns = $(view.el).find('.btn-resolve:not(.comment-resolved)');
btns.tooltip({title: me.textResolve, placement: 'cursor'});
btns.each(function(idx, item){
arr.push($(item).data('bs.tooltip').tip());
});
btns = $(view.el).find('.btn-resolve-check');
btns = $(view.el).find('.comment-resolved');
btns.tooltip({title: me.textOpenAgain, placement: 'cursor'});
btns.each(function(idx, item){
arr.push($(item).data('bs.tooltip').tip());

13
apps/common/main/lib/view/ReviewPopover.js
View file

@ -258,12 +258,12 @@ define([
}
var arr = [],
btns = $(view.el).find('.btn-resolve');
btns = $(view.el).find('.btn-resolve:not(.comment-resolved)');
btns.tooltip({title: me.textResolve, placement: 'cursor'});
btns.each(function (idx, item) {
arr.push($(item).data('bs.tooltip').tip());
});
btns = $(view.el).find('.btn-resolve-check');
btns = $(view.el).find('.comment-resolved');
btns.tooltip({title: me.textOpenAgain, placement: 'cursor'});
btns.each(function (idx, item) {
arr.push($(item).data('bs.tooltip').tip());
@ -451,14 +451,7 @@ define([
readdresolves();
} else if (btn.hasClass('btn-resolve', false)) {
var tip = btn.data('bs.tooltip');
if (tip) tip.dontShow = true;
me.fireEvent('comment:resolve', [commentId]);
readdresolves();
} else if (btn.hasClass('btn-resolve-check', false)) {
} else if (btn.hasClass('btn-resolve')) {
var tip = btn.data('bs.tooltip');
if (tip) tip.dontShow = true;