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

[SSE] Fix Bug 44904

Browse source
This commit is contained in:
Julia Radzhabova 2020-03-25 18:03:35 +03:00
parent 2195e0f7ec
commit 23d3d7fb8a
1 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1295,8 +1295,9 @@ define([
me.tooltips.filter.text = ''; me.tooltips.filter.text = '';
me.tooltips.filter.isHidden = true; me.tooltips.filter.isHidden = true;
} }
if (me.permissions.isEdit && !me.dlgFilter) { if (me.permissions.isEdit) {
me.dlgFilter = new SSE.Views.AutoFilterDialog({api: this.api}).on({ if (!me.dlgFilter) {
me.dlgFilter = new SSE.Views.AutoFilterDialog({api: this.api}).on({
'close': function () { 'close': function () {
if (me.api) { if (me.api) {
me.api.asc_enableKeyEvents(true); me.api.asc_enableKeyEvents(true);
@ -1305,23 +1306,25 @@ define([
} }
}); });
if (me.api) { if (me.api) {
me.api.asc_enableKeyEvents(false); me.api.asc_enableKeyEvents(false);
} }
Common.UI.Menu.Manager.hideAll(); Common.UI.Menu.Manager.hideAll();
me.dlgFilter.setSettings(config); me.dlgFilter.setSettings(config);
var offset = me.documentHolder.cmpEl.offset(), var offset = me.documentHolder.cmpEl.offset(),
rect = config.asc_getCellCoord(), rect = config.asc_getCellCoord(),
x = rect.asc_getX() + rect.asc_getWidth() +offset.left, x = rect.asc_getX() + rect.asc_getWidth() +offset.left,
y = rect.asc_getY() + rect.asc_getHeight() + offset.top; y = rect.asc_getY() + rect.asc_getHeight() + offset.top;
var docwidth = Common.Utils.innerWidth(), var docwidth = Common.Utils.innerWidth(),
docheight = Common.Utils.innerHeight(); docheight = Common.Utils.innerHeight();
if (x+me.dlgFilter.options.width > docwidth) if (x+me.dlgFilter.options.width > docwidth)
x = docwidth - me.dlgFilter.options.width - 5; x = docwidth - me.dlgFilter.options.width - 5;
if (y+me.dlgFilter.options.height > docheight) if (y+me.dlgFilter.options.height > docheight)
y = docheight - me.dlgFilter.options.height - 5; y = docheight - me.dlgFilter.options.height - 5;
me.dlgFilter.show(x, y); me.dlgFilter.show(x, y);
} else
me.dlgFilter.close();
} }
}, },