Commit 96a03e90 authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

убрал вызов drawAutoF при undo/redo

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58836 954022d7-b5bf-4e40-9824-e11837661b57
parent c9d7dbcc
...@@ -412,7 +412,8 @@ var gUndoInsDelCellsFlag = true; ...@@ -412,7 +412,8 @@ var gUndoInsDelCellsFlag = true;
if(isReDrawFilter && isReDrawFilter.TableColumns && isReDrawFilter.result) if(isReDrawFilter && isReDrawFilter.TableColumns && isReDrawFilter.result)
t._reDrawCurrentFilter(null, null, isReDrawFilter); t._reDrawCurrentFilter(null, null, isReDrawFilter);
t.drawAutoF(); if(openFilter == undefined)
t.drawAutoF();
isUpdateRange = changesElemHistory.Ref; isUpdateRange = changesElemHistory.Ref;
...@@ -1152,6 +1153,11 @@ var gUndoInsDelCellsFlag = true; ...@@ -1152,6 +1153,11 @@ var gUndoInsDelCellsFlag = true;
drawAutoF: function (updatedRange, offsetX, offsetY) { drawAutoF: function (updatedRange, offsetX, offsetY) {
var buttons = this.allButtonAF; var buttons = this.allButtonAF;
var ws = this.worksheet; var ws = this.worksheet;
var aWs = this._getCurrentWS();
if(aWs.workbook.bUndoChanges || aWs.workbook.bRedoChanges)
return;
var filters; var filters;
//проверяем, затрагивают ли данные кнопки визуальную область //проверяем, затрагивают ли данные кнопки визуальную область
...@@ -6634,7 +6640,7 @@ var gUndoInsDelCellsFlag = true; ...@@ -6634,7 +6640,7 @@ var gUndoInsDelCellsFlag = true;
} }
} }
if(oCurFilter[i].TableColumns && oCurFilter[i] && findFilters[i]) if(oCurFilter[i].TableStyleInfo && oCurFilter[i] && findFilters[i])
{ {
this._cleanStyleTable(aWs, oCurFilter[i].Ref); this._cleanStyleTable(aWs, oCurFilter[i].Ref);
this._setColorStyleTable(findFilters[i].Ref, findFilters[i]); this._setColorStyleTable(findFilters[i].Ref, findFilters[i]);
......
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