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

Merge pull request #1921 from ONLYOFFICE/fix/bug-58693

Browse source 
Fix Bug 58693
This commit is contained in:
Julia Radzhabova 2022-08-30 13:32:03 +03:00 committed by GitHub
parent 8a3abfeb47 d855278570
commit fae6b2ff5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file

@ -1289,6 +1289,9 @@ define([
row_columnTip.isHidden = true; row_columnTip.isHidden = true;
} }
} }
if (!index_foreign) {
me.hideForeignSelectTips();
}
if (me.permissions.isEdit || me.permissions.canViewComments) { if (me.permissions.isEdit || me.permissions.canViewComments) {
if (!index_comments || this.popupmenu) { if (!index_comments || this.popupmenu) {
commentTip.moveCommentId = undefined; commentTip.moveCommentId = undefined;
@ -1309,9 +1312,6 @@ define([
if (!index_locked) { if (!index_locked) {
me.hideCoAuthTips(); me.hideCoAuthTips();
} }
if (!index_foreign) {
me.hideForeignSelectTips();
}
if (index_slicer===undefined) { if (index_slicer===undefined) {
if (!slicerTip.isHidden && slicerTip.ref) { if (!slicerTip.isHidden && slicerTip.ref) {
slicerTip.ref.hide(); slicerTip.ref.hide();
@ -1511,48 +1511,47 @@ define([
} }
} }
} }
if (index_foreign && me.isUserVisible(dataarray[index_foreign-1].asc_getUserId())) { }
data = dataarray[index_foreign-1]; if (index_foreign && me.isUserVisible(dataarray[index_foreign-1].asc_getUserId())) {
data = dataarray[index_foreign-1];
if (!coAuthTip.XY) if (!coAuthTip.XY)
me.onDocumentResize(); me.onDocumentResize();
if (foreignSelect.x_point != data.asc_getX() || foreignSelect.y_point != data.asc_getY()) { if (foreignSelect.x_point != data.asc_getX() || foreignSelect.y_point != data.asc_getY()) {
me.hideForeignSelectTips(); me.hideForeignSelectTips();
foreignSelect.x_point = data.asc_getX(); foreignSelect.x_point = data.asc_getX();
foreignSelect.y_point = data.asc_getY(); foreignSelect.y_point = data.asc_getY();
var src = $(document.createElement("div")), var src = $(document.createElement("div")),
color = data.asc_getColor(); color = data.asc_getColor();
foreignSelect.ref = src; foreignSelect.ref = src;
foreignSelect.userId = data.asc_getUserId(); foreignSelect.userId = data.asc_getUserId();
src.addClass('username-tip'); src.addClass('username-tip');
src.css({ src.css({
height : foreignSelect.ttHeight + 'px', height : foreignSelect.ttHeight + 'px',
position : 'absolute', position : 'absolute',
zIndex : '900', zIndex : '900',
visibility : 'visible', visibility : 'visible',
'background-color': '#'+Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()) 'background-color': '#'+Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b())
}); });
$(document.body).append(src); $(document.body).append(src);
showPoint = [ showPoint = [
foreignSelect.x_point + coAuthTip.XY[0], foreignSelect.x_point + coAuthTip.XY[0],
foreignSelect.y_point + coAuthTip.XY[1] - foreignSelect.ttHeight foreignSelect.y_point + coAuthTip.XY[1] - foreignSelect.ttHeight
]; ];
src.text(me.getUserName(data.asc_getUserId())); src.text(me.getUserName(data.asc_getUserId()));
src.css({ src.css({
visibility : 'visible', visibility : 'visible',
left : ((showPoint[0]+foreignSelect.ref.outerWidth()>coAuthTip.bodyWidth-coAuthTip.rightMenuWidth) ? coAuthTip.bodyWidth-coAuthTip.rightMenuWidth-foreignSelect.ref.outerWidth() : showPoint[0]) + 'px', left : ((showPoint[0]+foreignSelect.ref.outerWidth()>coAuthTip.bodyWidth-coAuthTip.rightMenuWidth) ? coAuthTip.bodyWidth-coAuthTip.rightMenuWidth-foreignSelect.ref.outerWidth() : showPoint[0]) + 'px',
top : showPoint[1] + 'px' top : showPoint[1] + 'px'
}); });
}
} }
} }
if (index_filter!==undefined && !(me.dlgFilter && me.dlgFilter.isVisible()) && !(me.currentMenu && me.currentMenu.isVisible()) && !dataarray[index_filter-1].asc_getFilter().asc_getPivotObj()) { if (index_filter!==undefined && !(me.dlgFilter && me.dlgFilter.isVisible()) && !(me.currentMenu && me.currentMenu.isVisible()) && !dataarray[index_filter-1].asc_getFilter().asc_getPivotObj()) {
if (!filterTip.parentEl) { if (!filterTip.parentEl) {
filterTip.parentEl = $('<div id="tip-container-filtertip" style="position: absolute; z-index: 10000;"></div>'); filterTip.parentEl = $('<div id="tip-container-filtertip" style="position: absolute; z-index: 10000;"></div>');
@ -1840,7 +1839,8 @@ define([
me.documentHolder.cmpEl.offset().top - $(window).scrollTop() me.documentHolder.cmpEl.offset().top - $(window).scrollTop()
]; ];
me.tooltips.coauth.apiHeight = me.documentHolder.cmpEl.height(); me.tooltips.coauth.apiHeight = me.documentHolder.cmpEl.height();
me.tooltips.coauth.rightMenuWidth = $('#right-menu').width(); var rightMenu = $('#right-menu');
me.tooltips.coauth.rightMenuWidth = rightMenu.is(':visible') ? rightMenu.width() : 0;
me.tooltips.coauth.bodyWidth = $(window).width(); me.tooltips.coauth.bodyWidth = $(window).width();
me.tooltips.coauth.bodyHeight = $(window).height(); me.tooltips.coauth.bodyHeight = $(window).height();
} }