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

v5.1.2

Browse source
This commit is contained in:
Alexey Golubev 2018-04-11 14:28:01 +03:00
parent 665331f0d1 bc1d483c46
commit 09606f77bb
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -742,10 +742,10 @@ define([
if (!silentUpdate) { if (!silentUpdate) {
this.updateComments(false, true); this.updateComments(false, true);
if (this.getPopover() && this.getPopover().isVisible()) { // if (this.getPopover() && this.getPopover().isVisible()) {
this._dontScrollToComment = true; // this._dontScrollToComment = true;
this.api.asc_showComment(id, true); // this.api.asc_showComment(id, true);
} // }
} }
} }
}, },
@ -776,8 +776,9 @@ define([
onApiShowComment: function (uids, posX, posY, leftX, opts, hint) { onApiShowComment: function (uids, posX, posY, leftX, opts, hint) {
if (this.previewmode) return; if (this.previewmode) return;
this.isModeChanged = false; this.isModeChanged = false;
var same_uids = (0 === _.difference(this.uids, uids).length) && (0 === _.difference(uids, this.uids).length);
if (hint && this.isSelectedComment && (0 === _.difference(this.uids, uids).length)) { if (hint && this.isSelectedComment && same_uids) {
// хотим показать тот же коментарий что был и выбран // хотим показать тот же коментарий что был и выбран
return; return;
} }
@ -788,7 +789,7 @@ define([
if (popover) { if (popover) {
this.clearDummyComment(); this.clearDummyComment();
if (this.isSelectedComment && (0 === _.difference(this.uids, uids).length)) { if (this.isSelectedComment && same_uids) {
//NOTE: click to sdk view ? //NOTE: click to sdk view ?
if (this.api) { if (this.api) {
//this.view.txtComment.blur(); //this.view.txtComment.blur();
@ -827,10 +828,10 @@ define([
comment.set('hint', !_.isUndefined(hint) ? hint : false); comment.set('hint', !_.isUndefined(hint) ? hint : false);
if (!hint && this.hintmode) { if (!hint && this.hintmode) {
if (0 === _.difference(this.uids, uids).length && (this.uids.length === 0)) if (same_uids && (this.uids.length === 0))
animate = false; animate = false;
if (this.oldUids.length && (0 === _.difference(this.oldUids, uids).length)) { if (this.oldUids.length && (0 === _.difference(this.oldUids, uids).length) && (0 === _.difference(uids, this.oldUids).length)) {
animate = false; animate = false;
this.oldUids = []; this.oldUids = [];
} }