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

Fix Bug 58693

Browse source
This commit is contained in:
Julia Radzhabova 2022-08-30 13:06:51 +03:00
parent 8a3abfeb47
commit d855278570
1 changed files with 37 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
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,6 +1511,7 @@ define([
} }
} }
} }
}
if (index_foreign && me.isUserVisible(dataarray[index_foreign-1].asc_getUserId())) { if (index_foreign && me.isUserVisible(dataarray[index_foreign-1].asc_getUserId())) {
data = dataarray[index_foreign-1]; data = dataarray[index_foreign-1];
@ -1551,8 +1552,6 @@ define([
}); });
} }
} }
}
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();
} }