From fe0026bc3050fc844f1b4ca3c6e3b32dcb6ac1d8 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 24 Nov 2016 15:30:38 +0300 Subject: [PATCH] [SSE] Fix bug with layout for username-tip on the locked sheet. --- apps/spreadsheeteditor/main/app/controller/DocumentHolder.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index 4581048a5..f170bf418 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -936,12 +936,10 @@ define([ $(document.body).append(src); showPoint = [ - coAuthTip.x_point + coAuthTip.XY[0], + (is_sheet_lock) ? (coAuthTip.x_point + coAuthTip.rightMenuWidth) : (coAuthTip.bodyWidth - (coAuthTip.x_point + coAuthTip.XY[0])), coAuthTip.y_point + coAuthTip.XY[1] ]; - !is_sheet_lock && (showPoint[0] = coAuthTip.bodyWidth - showPoint[0]); - if (showPoint[1] > coAuthTip.XY[1] && showPoint[1] + coAuthTip.ttHeight < coAuthTip.XY[1] + coAuthTip.apiHeight) { src.text(getUserName(data.asc_getUserId())); @@ -1042,6 +1040,7 @@ define([ me.documentHolder.cmpEl.offset().top - $(window).scrollTop() ]; me.tooltips.coauth.apiHeight = me.documentHolder.cmpEl.height(); + me.tooltips.coauth.rightMenuWidth = $('#right-menu').width(); me.tooltips.coauth.bodyWidth = $(window).width(); } },