Commit 35ec7ffd authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

http://bugzserver/show_bug.cgi?id=25852 - Кнопка фильтра остается активной при...

http://bugzserver/show_bug.cgi?id=25852 - Кнопка фильтра остается активной при возникновении ошибки при добавлении к пустым данным

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57653 954022d7-b5bf-4e40-9824-e11837661b57
parent 720fc280
......@@ -1390,6 +1390,8 @@ var gUndoInsDelCellsFlag = true;
ws.changeWorksheet("update");
if(isTurnOffHistory)
History.TurnOn();
ws.handlers.trigger("selectionChanged", ws.getSelectionInfo());
}
else
return false;
......@@ -6371,6 +6373,7 @@ var gUndoInsDelCellsFlag = true;
if(paramsForCallBackAdd == "addAutoFilterOneCell" && this._isEmptyRange(activeCells, true))
{
ws.model.workbook.handlers.trigger("asc_onError", c_oAscError.ID.AutoFilterDataRangeError, c_oAscError.Level.NoCritical);
ws.handlers.trigger("selectionChanged", ws.getSelectionInfo());
return false;
};
......@@ -6441,6 +6444,7 @@ var gUndoInsDelCellsFlag = true;
else
{
ws.model.workbook.handlers.trigger("asc_onError", c_oAscError.ID.AutoFilterDataRangeError, c_oAscError.Level.NoCritical);
//ws.handlers.trigger("selectionChanged", ws.getSelectionInfo());
History.EndTransaction();
return false;
};
......@@ -6455,6 +6459,7 @@ var gUndoInsDelCellsFlag = true;
if(paramsForCallBackAdd == "addAutoFilterManyCells" && this._isEmptyRange(activeCells))
{
ws.model.workbook.handlers.trigger("asc_onError", c_oAscError.ID.AutoFilterDataRangeError, c_oAscError.Level.NoCritical);
ws.handlers.trigger("selectionChanged", ws.getSelectionInfo());
return false;
};
......
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