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

Merge pull request #1635 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2022-03-18 14:56:01 +03:00 committed by GitHub
parent 331570ddc9 5147704a86
commit 007f260583
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file

@ -2347,10 +2347,12 @@ define([
menu.cmpEl.attr({tabindex: "-1"}); menu.cmpEl.attr({tabindex: "-1"});
} }
var coord = me.api.asc_getActiveCellCoord(), var coord = me.api.asc_getActiveCellCoord(validation), // get merged cell for validation
offset = {left:0,top:0}, offset = {left:0,top:0},
showPoint = [coord.asc_getX() + offset.left, (coord.asc_getY() < 0 ? 0 : coord.asc_getY()) + coord.asc_getHeight() + offset.top]; showPoint = [coord.asc_getX() + offset.left + (validation ? coord.asc_getWidth() : 0), (coord.asc_getY() < 0 ? 0 : coord.asc_getY()) + coord.asc_getHeight() + offset.top];
menuContainer.css({left: showPoint[0], top : showPoint[1]}); menuContainer.css({left: showPoint[0], top : showPoint[1]});
menu.menuAlign = validation ? 'tr-br' : 'tl-bl';
me._preventClick = validation; me._preventClick = validation;
validation && menuContainer.attr('data-value', 'prevent-canvas-click'); validation && menuContainer.attr('data-value', 'prevent-canvas-click');
@ -2405,7 +2407,7 @@ define([
var coord = me.api.asc_getActiveCellCoord(), var coord = me.api.asc_getActiveCellCoord(),
offset = {left:0,top:0}, offset = {left:0,top:0},
showPoint = [coord.asc_getX() + offset.left, (coord.asc_getY() < 0 ? 0 : coord.asc_getY()) + coord.asc_getHeight() + offset.top]; showPoint = [coord.asc_getX() + offset.left + coord.asc_getWidth(), (coord.asc_getY() < 0 ? 0 : coord.asc_getY()) + coord.asc_getHeight() + offset.top];
menuContainer.css({left: showPoint[0], top : showPoint[1]}); menuContainer.css({left: showPoint[0], top : showPoint[1]});
me._preventClick = true; me._preventClick = true;

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

@ -1103,6 +1103,7 @@ define([
this.tableTotalMenu = new Common.UI.Menu({ this.tableTotalMenu = new Common.UI.Menu({
maxHeight: 160, maxHeight: 160,
menuAlign: 'tr-br',
cyclic: false, cyclic: false,
cls: 'lang-menu', cls: 'lang-menu',
items: [ items: [