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

[SSE] fix Bug 31542.

Browse source
This commit is contained in:
Julia Radzhabova 2016-05-30 15:18:14 +03:00
parent 2f31268af3
commit 3730003490
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -774,6 +774,7 @@ define([
this._setDefaults(); this._setDefaults();
var checkDocumentClick = function(e) { var checkDocumentClick = function(e) {
if (me._skipCheckDocumentClick) return;
if ($(e.target).closest('.filter-dlg').length<=0) if ($(e.target).closest('.filter-dlg').length<=0)
me.close(); me.close();
}; };
@ -1160,7 +1161,7 @@ define([
this.miClear.setDisabled(this.initialFilterType === Asc.c_oAscAutoFilterTypes.None); this.miClear.setDisabled(this.initialFilterType === Asc.c_oAscAutoFilterTypes.None);
this.miReapply.setDisabled(this.initialFilterType === Asc.c_oAscAutoFilterTypes.None); this.miReapply.setDisabled(this.initialFilterType === Asc.c_oAscAutoFilterTypes.None);
this.btnOk.setDisabled(isCustomFilter); this.btnOk.setDisabled(this.initialFilterType !== Asc.c_oAscAutoFilterTypes.Filters && this.initialFilterType !== Asc.c_oAscAutoFilterTypes.None);
}, },
setupDataCells: function() { setupDataCells: function() {
@ -1248,7 +1249,7 @@ define([
this.cells.at(0).set('check', !haveUnselectedCell); this.cells.at(0).set('check', !haveUnselectedCell);
this.checkCellTrigerBlock = undefined; this.checkCellTrigerBlock = undefined;
} }
this.btnOk.setDisabled(this.cells.length<1);
this.cellsList.scroller.update({minScrollbarLength : 40, alwaysVisibleY: true, suppressScrollX: true}); this.cellsList.scroller.update({minScrollbarLength : 40, alwaysVisibleY: true, suppressScrollX: true});
}, },
@ -1268,9 +1269,11 @@ define([
} }
if (!isValid) { if (!isValid) {
me._skipCheckDocumentClick = true;
Common.UI.warning({title: this.textWarning, Common.UI.warning({title: this.textWarning,
msg: this.warnNoSelected, msg: this.warnNoSelected,
callback: function() { callback: function() {
me._skipCheckDocumentClick = false;
_.delay(function () { _.delay(function () {
me.input.$el.find('input').focus(); me.input.$el.find('input').focus();
}, 100, this); }, 100, this);
@ -1308,7 +1311,10 @@ define([
}); });
isValid = true; isValid = true;
} }
if (isValid) this.api.asc_applyAutoFilter(this.configTo); if (isValid) {
this.configTo.asc_getFilterObj().asc_setType(Asc.c_oAscAutoFilterTypes.Filters);
this.api.asc_applyAutoFilter(this.configTo);
}
} }
}, },