Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[DE][PE][SSE] Fix position of zoom, lang, preview dropdowns

Browse source
This commit is contained in:
JuliaSvinareva 2020-10-27 14:30:06 +03:00
parent 7156601948
commit c511a8e6cf
4 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/common/main/lib/component/Menu.js
View file

@ -167,6 +167,7 @@ define([
this.rendered = false;
this.items = [];
this.offset = [0, 0];
this.popperOffset = this.options.popperOffset || '';
this.menuAlign = this.options.menuAlign;
this.menuAlignEl = this.options.menuAlignEl;
this.scrollAlwaysVisible = this.options.scrollAlwaysVisible;
@ -261,6 +262,9 @@ define([
this.parentEl.on('hidden.bs.dropdown', _.bind(me.onAfterHideMenu, me));
this.parentEl.on('keydown.after.bs.dropdown', _.bind(me.onAfterKeydownMenu, me));
this.parentEl.find('[data-toggle="dropdown"]').data('boundary', $('#viewport')[0]);
this.popperOffset && this.parentEl.find('[data-toggle="dropdown"]').data('offset', this.popperOffset);
menuRoot.hover(
function(e) { me.isOver = true;},
function(e) { me.isOver = false; }
@ -654,6 +658,7 @@ define([
this.rendered = false;
this.items = this.options.items || [];
this.offset = [0, 0];
this.popperOffset = this.options.popperOffset || '';
this.menuAlign = this.options.menuAlign;
this.menuAlignEl = this.options.menuAlignEl;
this.scrollAlwaysVisible = this.options.scrollAlwaysVisible;
@ -724,6 +729,9 @@ define([
this.parentEl.on('hidden.bs.dropdown', _.bind(me.onAfterHideMenu, me));
this.parentEl.on('keydown.after.bs.dropdown', _.bind(me.onAfterKeydownMenu, me));
this.parentEl.find('[data-toggle="dropdown"]').data('boundary', $('#viewport')[0]);
this.popperOffset && this.parentEl.find('[data-toggle="dropdown"]').data('offset', this.popperOffset);
menuRoot.hover(
function(e) { me.isOver = true;},
function(e) { me.isOver = false; }

6
apps/documenteditor/main/app/view/Statusbar.js
View file

@ -230,8 +230,9 @@ define([
this.langMenu = new Common.UI.MenuSimple({
cls: 'lang-menu',
style: 'margin-top:-5px;',
restoreHeight: 285,
popperOffset: '0,-2',
style: 'margin-top: -5px;',
itemTemplate: _.template([
'<a id="<%= id %>" class="dropdown-item" tabindex="-1" type="menuitem" style="padding-left: 28px !important;" langval="<%= value.value %>" class="<% if (checked) { %> checked <% } %>">',
'<i class="icon <% if (spellcheck) { %> toolbar__icon btn-ic-docspell spellcheck-lang <% } %>"></i>',
@ -243,8 +244,9 @@ define([
});
this.zoomMenu = new Common.UI.Menu({
style: 'margin-top:-5px;',
menuAlign: 'bl-tl',
popperOffset: '0,-2',
style: 'margin-top: -5px;',
items: [
{ caption: "50%", value: 50 },
{ caption: "75%", value: 75 },

9
apps/presentationeditor/main/app/view/Statusbar.js
View file

@ -146,8 +146,9 @@ define([
);
this.zoomMenu = new Common.UI.Menu({
style: 'margin-top:-5px;',
popperOffset: '0,-2',
menuAlign: 'bl-tl',
style: 'margin-top: -5px;margin-bottom: 6px;',
items: [
{ caption: "50%", value: 50 },
{ caption: "75%", value: 75 },
@ -238,7 +239,8 @@ define([
split: true,
menu: new Common.UI.Menu({
menuAlign: 'bl-tl',
style: 'margin-top:-5px;',
style: 'margin-top:-5px;margin-bottom:5px;',
popperOffset: '0,-2',
items: [
{caption: this.textShowBegin, value: 0},
{caption: this.textShowCurrent, value: 1},
@ -250,7 +252,8 @@ define([
var panelLang = $('.cnt-lang',this.el);
this.langMenu = new Common.UI.MenuSimple({
cls: 'lang-menu',
style: 'margin-top:-5px;',
popperOffset: '0,-2',
style: 'margin-top: -5px;margin-bottom: 6px;',
restoreHeight: 285,
itemTemplate: _.template([
'<a id="<%= id %>" tabindex="-1" type="menuitem" style="padding-left: 28px !important;" langval="<%= value.value %>" class="<% if (checked) { %> checked <% } %>">',

1
apps/spreadsheeteditor/main/app/view/Statusbar.js
View file

@ -149,6 +149,7 @@ define([
this.zoomMenu = new Common.UI.Menu({
style: 'margin-top:-5px;',
popperOffset: '0,-2',
menuAlign: 'bl-tl',
items: [
{ caption: "50%", value: 50 },