diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index 8b7a931d7..de6637d85 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -1289,6 +1289,9 @@ define([ row_columnTip.isHidden = true; } } + if (!index_foreign) { + me.hideForeignSelectTips(); + } if (me.permissions.isEdit || me.permissions.canViewComments) { if (!index_comments || this.popupmenu) { commentTip.moveCommentId = undefined; @@ -1309,9 +1312,6 @@ define([ if (!index_locked) { me.hideCoAuthTips(); } - if (!index_foreign) { - me.hideForeignSelectTips(); - } if (index_slicer===undefined) { if (!slicerTip.isHidden && slicerTip.ref) { 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) - me.onDocumentResize(); + if (!coAuthTip.XY) + me.onDocumentResize(); - if (foreignSelect.x_point != data.asc_getX() || foreignSelect.y_point != data.asc_getY()) { - me.hideForeignSelectTips(); + if (foreignSelect.x_point != data.asc_getX() || foreignSelect.y_point != data.asc_getY()) { + me.hideForeignSelectTips(); - foreignSelect.x_point = data.asc_getX(); - foreignSelect.y_point = data.asc_getY(); + foreignSelect.x_point = data.asc_getX(); + foreignSelect.y_point = data.asc_getY(); - var src = $(document.createElement("div")), - color = data.asc_getColor(); - foreignSelect.ref = src; - foreignSelect.userId = data.asc_getUserId(); + var src = $(document.createElement("div")), + color = data.asc_getColor(); + foreignSelect.ref = src; + foreignSelect.userId = data.asc_getUserId(); - src.addClass('username-tip'); - src.css({ - height : foreignSelect.ttHeight + 'px', - position : 'absolute', - zIndex : '900', - visibility : 'visible', - 'background-color': '#'+Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()) - }); - $(document.body).append(src); + src.addClass('username-tip'); + src.css({ + height : foreignSelect.ttHeight + 'px', + position : 'absolute', + zIndex : '900', + visibility : 'visible', + 'background-color': '#'+Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()) + }); + $(document.body).append(src); - showPoint = [ - foreignSelect.x_point + coAuthTip.XY[0], - foreignSelect.y_point + coAuthTip.XY[1] - foreignSelect.ttHeight - ]; + showPoint = [ + foreignSelect.x_point + coAuthTip.XY[0], + foreignSelect.y_point + coAuthTip.XY[1] - foreignSelect.ttHeight + ]; - src.text(me.getUserName(data.asc_getUserId())); - src.css({ - visibility : 'visible', - left : ((showPoint[0]+foreignSelect.ref.outerWidth()>coAuthTip.bodyWidth-coAuthTip.rightMenuWidth) ? coAuthTip.bodyWidth-coAuthTip.rightMenuWidth-foreignSelect.ref.outerWidth() : showPoint[0]) + 'px', - top : showPoint[1] + 'px' - }); - } + src.text(me.getUserName(data.asc_getUserId())); + src.css({ + visibility : 'visible', + left : ((showPoint[0]+foreignSelect.ref.outerWidth()>coAuthTip.bodyWidth-coAuthTip.rightMenuWidth) ? coAuthTip.bodyWidth-coAuthTip.rightMenuWidth-foreignSelect.ref.outerWidth() : showPoint[0]) + '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 (!filterTip.parentEl) { 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.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.bodyHeight = $(window).height(); }