From 067874c8b41a75ee942a004e941923ea2e296573 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Wed, 2 Dec 2020 17:33:52 +0300 Subject: [PATCH] [SSE] Update bootstrap (Fix dropdown menu position of pivot settings) --- apps/common/main/lib/component/Menu.js | 2 +- apps/spreadsheeteditor/main/app/view/PivotSettings.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/common/main/lib/component/Menu.js b/apps/common/main/lib/component/Menu.js index 16f0ed12f..d16037562 100644 --- a/apps/common/main/lib/component/Menu.js +++ b/apps/common/main/lib/component/Menu.js @@ -1020,7 +1020,7 @@ define([ setOffset: function(offsetX, offsetY) { this.offset[0] = _.isUndefined(offsetX) ? this.offset[0] : offsetX; this.offset[1] = _.isUndefined(offsetY) ? this.offset[1] : offsetY; - //this.alignPosition(); + this.display === 'static' && this.alignPosition(); }, getOffset: function() { diff --git a/apps/spreadsheeteditor/main/app/view/PivotSettings.js b/apps/spreadsheeteditor/main/app/view/PivotSettings.js index d7ee80d17..186a3ba29 100644 --- a/apps/spreadsheeteditor/main/app/view/PivotSettings.js +++ b/apps/spreadsheeteditor/main/app/view/PivotSettings.js @@ -590,6 +590,8 @@ define([ } menu.menuAlignEl = currentTarget; + menu.cmpEl.css({'position': 'fixed'}); + menu.cmpEl.data('display', 'static'); menu.setOffset(-20, -currentTarget.height()/2 - 3); menu.show(); _.delay(function() { @@ -765,6 +767,8 @@ define([ } menu.menuAlignEl = currentTarget; + menu.cmpEl.css({'position': 'fixed'}); + menu.cmpEl.data('display', 'static'); menu.setOffset(-20, -currentTarget.height()/2 - 3); menu.show(); _.delay(function() {