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

[SSE] Fix filter window resizing

Browse source
This commit is contained in:
Julia Radzhabova 2020-06-09 10:47:24 +03:00
parent 07035bd7c3
commit f7b704da61
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
View file

@ -469,11 +469,9 @@ define([
SSE.Views.AutoFilterDialog = Common.UI.Window.extend(_.extend({ SSE.Views.AutoFilterDialog = Common.UI.Window.extend(_.extend({
initialize: function (options) { initialize: function (options) {
this.menuPanelWidth = 195; var t = this, _options = {}, width = 450, height = undefined;
var t = this, _options = {}, width = undefined, height = undefined;
if (Common.Utils.InternalSettings.get('sse-settings-size-filter-window')) { if (Common.Utils.InternalSettings.get('sse-settings-size-filter-window')) {
width = Common.Utils.InternalSettings.get('sse-settings-size-filter-window')[0] + this.menuPanelWidth; width = Common.Utils.InternalSettings.get('sse-settings-size-filter-window')[0];
height = Common.Utils.InternalSettings.get('sse-settings-size-filter-window')[1]; height = Common.Utils.InternalSettings.get('sse-settings-size-filter-window')[1];
} }
@ -507,7 +505,7 @@ define([
'<button class="btn normal dlg-btn" result="cancel">', t.cancelButtonText, '</button>', '<button class="btn normal dlg-btn" result="cancel">', t.cancelButtonText, '</button>',
'</div>', '</div>',
'</div>', '</div>',
'<div class="menu-panel" style="width: ' + this.menuPanelWidth + 'px; float: right;">', '<div class="menu-panel" style="float: right;">',
'<div id="menu-container-filters" style=""><div class="dropdown-toggle" data-toggle="dropdown"></div></div>', '<div id="menu-container-filters" style=""><div class="dropdown-toggle" data-toggle="dropdown"></div></div>',
'</div>', '</div>',
'</div>' '</div>'
@ -1165,6 +1163,12 @@ define([
_setDefaults: function() { _setDefaults: function() {
this.initialFilterType = this.configTo.asc_getFilterObj().asc_getType(); this.initialFilterType = this.configTo.asc_getFilterObj().asc_getType();
var menuPanel = this.$window.find('.menu-panel');
this.menuPanelWidth = menuPanel.innerWidth();
var width = this.getWidth();
if (Common.Utils.InternalSettings.get('sse-settings-size-filter-window')) {
width = Common.Utils.InternalSettings.get('sse-settings-size-filter-window')[0] + this.menuPanelWidth;
}
var pivotObj = this.configTo.asc_getPivotObj(), var pivotObj = this.configTo.asc_getPivotObj(),
isPivot = !!pivotObj, isPivot = !!pivotObj,
@ -1175,10 +1179,9 @@ define([
if (isPivot) { if (isPivot) {
if (pivotObj.asc_getIsPageFilter()) { if (pivotObj.asc_getIsPageFilter()) {
var menuPanel = this.$window.find('.menu-panel'); this.setResizable(true, [this.initConfig.minwidth - this.menuPanelWidth, this.initConfig.minheight]);
this.setResizable(true, this.initConfig.minwidth - this.menuPanelWidth, this.initConfig.minheight);
menuPanel.addClass('hidden'); menuPanel.addClass('hidden');
this.setWidth(this.getWidth() - this.menuPanelWidth); width -= this.menuPanelWidth;
this.menuPanelWidth = 0; this.menuPanelWidth = 0;
} }
this.miReapplySeparator.setVisible(false); this.miReapplySeparator.setVisible(false);
@ -1186,6 +1189,7 @@ define([
isValueFilter = (pivotObj.asc_getDataFieldIndexFilter()!==null); isValueFilter = (pivotObj.asc_getDataFieldIndexFilter()!==null);
} }
this.setSize(width, this.getHeight());
var filterObj = this.configTo.asc_getFilterObj(), var filterObj = this.configTo.asc_getFilterObj(),
isCustomFilter = (this.initialFilterType === Asc.c_oAscAutoFilterTypes.CustomFilters), isCustomFilter = (this.initialFilterType === Asc.c_oAscAutoFilterTypes.CustomFilters),