From df9855e1134dcb10311cd82f47eebe6ffb312e22 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 1 Dec 2017 13:28:41 +0300 Subject: [PATCH] [SSE] Hide autoexpansion button when it's over canvas borders. --- .../main/app/controller/DocumentHolder.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index 1b8f1f14c..bbc7be312 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -1918,11 +1918,15 @@ define([ }); } - if ( coord.asc_getX()<0 || coord.asc_getY()<0) { + var width = me.tooltips.coauth.bodyWidth - me.tooltips.coauth.XY[0] - me.tooltips.coauth.rightMenuWidth - 15, + height = me.tooltips.coauth.apiHeight - 15, // height - scrollbar height + btnSize = [31, 20], + right = coord.asc_getX() + coord.asc_getWidth() + 2 + btnSize[0], + bottom = coord.asc_getY() + coord.asc_getHeight() + 1 + btnSize[1]; + if (right > width || bottom > height || coord.asc_getX()<0 || coord.asc_getY()<0) { if (pasteContainer.is(':visible')) pasteContainer.hide(); } else { - var showPoint = [coord.asc_getX() + coord.asc_getWidth() + 3, coord.asc_getY() + coord.asc_getHeight() + 3]; - pasteContainer.css({left: showPoint[0], top : showPoint[1]}); + pasteContainer.css({left: right - btnSize[0], top : bottom - btnSize[1]}); pasteContainer.show(); } },