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

Merge pull request #228 from ONLYOFFICE/feature/de-settings

Browse source 
Feature/de settings
This commit is contained in:
Julia Radzhabova 2019-08-14 17:30:54 +03:00 committed by GitHub
parent 2e38661ebd 79232c3447
commit 7699f76b64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -475,12 +475,16 @@ define([
SSE.Views.AutoFilterDialog = Common.UI.Window.extend(_.extend({ SSE.Views.AutoFilterDialog = Common.UI.Window.extend(_.extend({
initialize: function (options) { initialize: function (options) {
var t = this, _options = {}; var t = this, _options = {}, width = undefined, height = undefined;
if (Common.Utils.InternalSettings.get('sse-settings-size-filter-window')) {
width = Common.Utils.InternalSettings.get('sse-settings-size-filter-window')[0];
height = Common.Utils.InternalSettings.get('sse-settings-size-filter-window')[1];
}
_.extend(_options, { _.extend(_options, {
width : 450, width : width || 450,
height : 265, height : height || 265,
contentWidth : 400, contentWidth : (width - 50) || 400,
header : false, header : false,
cls : 'filter-dlg', cls : 'filter-dlg',
contentTemplate : '', contentTemplate : '',
@ -489,8 +493,8 @@ define([
animate : false, animate : false,
items : [], items : [],
resizable : true, resizable : true,
minwidth : 450, minwidth : 450,
minheight : 265 minheight : 265
}, options); }, options);
this.template = options.template || [ this.template = options.template || [
@ -811,6 +815,11 @@ define([
_.delay(function () { _.delay(function () {
$(document.body).on('mousedown', checkDocumentClick); $(document.body).on('mousedown', checkDocumentClick);
}, 100, this); }, 100, this);
if(Common.Utils.InternalSettings.get('sse-settings-size-filter-window')) {
this.$window.find('.combo-values').css({'height': Common.Utils.InternalSettings.get('sse-settings-size-filter-window')[1] - 103 + 'px'});
this.cellsList.scroller.update({minScrollbarLength : 40, alwaysVisibleY: true, suppressScrollX: true});
}
}, },
show: function (x, y) { show: function (x, y) {
@ -1394,6 +1403,7 @@ define([
this.$window.find('.combo-values').css({'height': size[1] - 100 + 'px'}); this.$window.find('.combo-values').css({'height': size[1] - 100 + 'px'});
this.curSize.height = size[1]; this.curSize.height = size[1];
} }
Common.Utils.InternalSettings.set('sse-settings-size-filter-window', size);
}, },
okButtonText : 'Ok', okButtonText : 'Ok',