From cef3ae8ac31d0789448d214f7253cd6be40c66d5 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 5 Jul 2023 21:36:10 +0300 Subject: [PATCH] [DE] Hide special button when it's out of view (bug 63194) --- .../main/app/controller/DocumentHolder.js | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/apps/documenteditor/main/app/controller/DocumentHolder.js b/apps/documenteditor/main/app/controller/DocumentHolder.js index 22edacea5a..8a4927242c 100644 --- a/apps/documenteditor/main/app/controller/DocumentHolder.js +++ b/apps/documenteditor/main/app/controller/DocumentHolder.js @@ -1257,20 +1257,22 @@ define([ }); (menu.items.length>0) && menu.items[0].setChecked(true, true); } - if (coord.asc_getX()<0 || coord.asc_getY()<0) { + + var showPoint = [coord.asc_getX() + coord.asc_getWidth() + 3, coord.asc_getY() + coord.asc_getHeight() + 3]; + if (coord.asc_getX()<0 || coord.asc_getY()<0 || showPoint[0]>me._Width || showPoint[1]>me._Height) { if (pasteContainer.is(':visible')) pasteContainer.hide(); $(document).off('keyup', this.wrapEvents.onKeyUp); - } else { - var showPoint = [coord.asc_getX() + coord.asc_getWidth() + 3, coord.asc_getY() + coord.asc_getHeight() + 3]; - if (!Common.Utils.InternalSettings.get("de-hidden-rulers")) { - showPoint = [showPoint[0] - 19, showPoint[1] - 26]; - } - pasteContainer.css({left: showPoint[0], top : showPoint[1]}); - pasteContainer.show(); - setTimeout(function() { - $(document).on('keyup', me.wrapEvents.onKeyUp); - }, 10); + return; } + + if (!Common.Utils.InternalSettings.get("de-hidden-rulers")) { + showPoint = [showPoint[0] - 19, showPoint[1] - 26]; + } + pasteContainer.css({left: showPoint[0], top : showPoint[1]}); + pasteContainer.show(); + setTimeout(function() { + $(document).on('keyup', me.wrapEvents.onKeyUp); + }, 10); this.disableSpecialPaste(); },