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

[SSE] Fix Bug 34315.

Browse source
This commit is contained in:
Julia Radzhabova 2017-03-16 17:46:28 +03:00
parent 01c3b25066
commit b01e8e59a1
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -87,7 +87,6 @@ define([
underline: undefined, underline: undefined,
wrap: undefined, wrap: undefined,
merge: undefined, merge: undefined,
filter: undefined,
angle: undefined, angle: undefined,
controlsdisabled: { controlsdisabled: {
rows: undefined, rows: undefined,
@ -97,6 +96,8 @@ define([
filters: undefined filters: undefined
}, },
selection_type: undefined, selection_type: undefined,
filter: undefined,
filterapplied: false,
tablestylename: undefined, tablestylename: undefined,
tablename: undefined, tablename: undefined,
namedrange_locked: false, namedrange_locked: false,
@ -1971,10 +1972,16 @@ define([
} }
} }
this._state.tablename = (formatTableInfo) ? formatTableInfo.asc_getTableName() : undefined;
need_disable = this._state.controlsdisabled.filters || !filterInfo || (filterInfo.asc_getIsApplyAutoFilter()!==true); need_disable = this._state.controlsdisabled.filters || !filterInfo || (filterInfo.asc_getIsApplyAutoFilter()!==true);
toolbar.lockToolbar(SSE.enumLock.ruleDelFilter, need_disable, {array:[toolbar.btnClearAutofilter,toolbar.mnuitemClearFilter]}); toolbar.lockToolbar(SSE.enumLock.ruleDelFilter, need_disable, {array:[toolbar.btnClearAutofilter,toolbar.mnuitemClearFilter]});
var old_name = this._state.tablename;
this._state.tablename = (formatTableInfo) ? formatTableInfo.asc_getTableName() : undefined;
var old_applied = this._state.filterapplied;
this._state.filterapplied = this._state.filter && filterInfo.asc_getIsApplyAutoFilter();
if (this._state.tablename !== old_name || this._state.filterapplied !== old_applied)
this.getApplication().getController('Statusbar').onApiFilterInfo(!need_disable); this.getApplication().getController('Statusbar').onApiFilterInfo(!need_disable);
this._state.multiselect = info.asc_getFlags().asc_getMultiselect(); this._state.multiselect = info.asc_getFlags().asc_getMultiselect();

6
apps/spreadsheeteditor/main/app/view/Statusbar.js
View file

@ -437,8 +437,12 @@ define([
} else if (countFilter) {// filter mode } else if (countFilter) {// filter mode
if (!this.boxFiltered.is(':visible')) this.boxFiltered.show(); if (!this.boxFiltered.is(':visible')) this.boxFiltered.show();
this.labelFiltered.text(this.filteredText); this.labelFiltered.text(this.filteredText);
} else { } else if (countFilter !== undefined && countFilter !== null){
if (this.boxFiltered.is(':visible')) this.boxFiltered.hide(); if (this.boxFiltered.is(':visible')) this.boxFiltered.hide();
} else {
var filterInfo = this.api.asc_getCellInfo().asc_getAutoFilterInfo(),
need_disable = !filterInfo || (filterInfo.asc_getIsApplyAutoFilter()!==true);
this.setFilteredInfo(!need_disable);
} }
var me = this; var me = this;