From f44e31fbd7f46dd4e7506e30cef1bb7cf6415a66 Mon Sep 17 00:00:00 2001 From: "Julia.Svinareva" Date: Fri, 19 Apr 2024 12:58:49 +0300 Subject: [PATCH] [PE] Fix animation panel (2) --- .../main/app/controller/DocumentHolder.js | 16 ++++++++++------ .../main/app/view/DocumentHolder.js | 1 - 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/apps/presentationeditor/main/app/controller/DocumentHolder.js b/apps/presentationeditor/main/app/controller/DocumentHolder.js index 52a043cc8a..53f60049a0 100644 --- a/apps/presentationeditor/main/app/controller/DocumentHolder.js +++ b/apps/presentationeditor/main/app/controller/DocumentHolder.js @@ -493,12 +493,16 @@ define([ } if (event.get_Type() == Asc.c_oAscContextMenuTypes.AnimEffect) { - //showPoint[0] += event.get_ButtonWidth() + 2; - //showPoint[1] += event.get_ButtonHeight() + 2; - menu.menuAlign = 'tr-br'; - if (me.documentHolder.cmpEl.offset().top + showPoint[1] + menu.menuRoot.outerHeight() > Common.Utils.innerHeight() - 10) { - //showPoint[1] -= event.get_ButtonHeight() + 4; - menu.menuAlign = 'br-tr'; + if (event.get_ButtonWidth()) { + showPoint[0] += event.get_ButtonWidth() + 2; + showPoint[1] += event.get_ButtonHeight() + 2; + menu.menuAlign = 'tr-br'; + if (me.documentHolder.cmpEl.offset().top + showPoint[1] + menu.menuRoot.outerHeight() > Common.Utils.innerHeight() - 10) { + showPoint[1] -= event.get_ButtonHeight() + 4; + menu.menuAlign = 'br-tr'; + } + } else { + menu.menuAlign = 'tl-tr'; } } diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index a1391e9147..f14c0d4d16 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -2474,7 +2474,6 @@ define([ me.animEffectMenu = new Common.UI.Menu({ restoreHeightAndTop: true, scrollToCheckedItem: false, - menuAlign: 'tr-br', style: 'min-width: auto;', initMenu: function(value){ me.menuAnimStartOnClick.setChecked(value.effect === AscFormat.NODE_TYPE_CLICKEFFECT, true);