Commit 990eba10 authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

добавил функцию, отдающую состояние кнопки а/ф

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57589 954022d7-b5bf-4e40-9824-e11837661b57
parent 4d1b56bd
...@@ -166,6 +166,7 @@ ...@@ -166,6 +166,7 @@
this.numFormatType = null; this.numFormatType = null;
this.angle = null; this.angle = null;
this.clearFilter = null; this.clearFilter = null;
this.isAutoFilter = false;
} }
asc_CCellInfo.prototype = { asc_CCellInfo.prototype = {
...@@ -187,7 +188,8 @@ ...@@ -187,7 +188,8 @@
asc_getStyleName: function () { return this.styleName; }, asc_getStyleName: function () { return this.styleName; },
asc_getNumFormatType: function(){ return this.numFormatType; }, asc_getNumFormatType: function(){ return this.numFormatType; },
asc_getAngle: function () { return this.angle; }, asc_getAngle: function () { return this.angle; },
asc_getClearFilter: function () { return this.clearFilter; } asc_getClearFilter: function () { return this.clearFilter; },
asc_getIsAutoFilter: function () { return this.isAutoFilter; }
}; };
window["Asc"].asc_CCellInfo = window["Asc"]["asc_CCellInfo"] = asc_CCellInfo; window["Asc"].asc_CCellInfo = window["Asc"]["asc_CCellInfo"] = asc_CCellInfo;
...@@ -212,5 +214,6 @@ ...@@ -212,5 +214,6 @@
prot["asc_getNumFormatType"] = prot.asc_getNumFormatType; prot["asc_getNumFormatType"] = prot.asc_getNumFormatType;
prot["asc_getAngle"] = prot.asc_getAngle; prot["asc_getAngle"] = prot.asc_getAngle;
prot["asc_getClearFilter"] = prot.asc_getClearFilter; prot["asc_getClearFilter"] = prot.asc_getClearFilter;
prot["asc_getIsAutoFilter"] = prot.asc_getIsAutoFilter;
} }
)(window); )(window);
\ No newline at end of file
...@@ -6446,17 +6446,18 @@ ...@@ -6446,17 +6446,18 @@
//null - disable, true - pressed button, false - unpressed button //null - disable, true - pressed button, false - unpressed button
var tablePartsOptions = this.autoFilters.searchRangeInTableParts(activeCell); var tablePartsOptions = this.autoFilters.searchRangeInTableParts(activeCell);
cell_info.isFormatTable = (null !== tablePartsOptions);
if(tablePartsOptions === null) if(tablePartsOptions === null)
{ {
var checkApplyFilterOrSort = this.autoFilters.checkApplyFilterOrSort(); var checkApplyFilterOrSort = this.autoFilters.checkApplyFilterOrSort();
cell_info.isFormatTable = checkApplyFilterOrSort.isAutoFilter; cell_info.isAutoFilter = checkApplyFilterOrSort.isAutoFilter;
cell_info.clearFilter = checkApplyFilterOrSort.isFilterColumns; cell_info.clearFilter = checkApplyFilterOrSort.isFilterColumns;
} }
else else
{ {
if(tablePartsOptions.tableRange.containsRange(activeCell)) if(tablePartsOptions.tableRange.containsRange(activeCell))
{ {
cell_info.isFormatTable = true; cell_info.isAutoFilter = true;
if(this.autoFilters.checkApplyFilterOrSort(tablePartsOptions.id)) if(this.autoFilters.checkApplyFilterOrSort(tablePartsOptions.id))
cell_info.clearFilter = true; cell_info.clearFilter = true;
else else
...@@ -6464,7 +6465,7 @@ ...@@ -6464,7 +6465,7 @@
} }
else else
{ {
cell_info.isFormatTable = null; cell_info.isAutoFilter = null;
cell_info.clearFilter = null; cell_info.clearFilter = null;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment