Commit 8ce31933 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Убрал selectionChanged из автофильров. Она там не должна вызываться.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58802 954022d7-b5bf-4e40-9824-e11837661b57
parent be388a72
......@@ -5,7 +5,7 @@ var g_bDate1904 = false;
var CellValueType =
{
Number:0,
String:1,
String:1,
Bool:2,
Error:3
};
......
......@@ -756,7 +756,6 @@ var gUndoInsDelCellsFlag = true;
if(apocal == 'error')
{
ws.model.workbook.handlers.trigger("asc_onError", c_oAscError.ID.AutoFilterDataRangeError, c_oAscError.Level.NoCritical);
ws.handlers.trigger("selectionChanged", ws.getSelectionInfo());
return false;
}
else if(apocal && apocal.changeStyle)
......@@ -784,8 +783,7 @@ var gUndoInsDelCellsFlag = true;
onAddAutoFiltersCallback(true);
else
ws._isLockedCells(rangeShift1, /*subType*/null, onAddAutoFiltersCallback);
ws.handlers.trigger("selectionChanged", ws.getSelectionInfo());
return;
}
else if((apocal && apocal.containsFilter != false && !lTable) || (apocal && apocal.changeAllFOnTable))
......@@ -842,8 +840,6 @@ var gUndoInsDelCellsFlag = true;
onAddAutoFiltersCallback(true);
else
ws._isLockedCells(rangeShift1, /*subType*/null, onAddAutoFiltersCallback);
ws.handlers.trigger("selectionChanged", ws.getSelectionInfo());
return;
}
else if(apocal && apocal.containsFilter == false)
......@@ -875,8 +871,6 @@ var gUndoInsDelCellsFlag = true;
onAddAutoFiltersCallback(true);
else
ws._isLockedCells(rangeShift1, /*subType*/null, onAddAutoFiltersCallback);
ws.handlers.trigger("selectionChanged", ws.getSelectionInfo());
return;
}
else if(aWs.AutoFilter)
......@@ -899,8 +893,6 @@ var gUndoInsDelCellsFlag = true;
onAddAutoFiltersCallback(true);
else
ws._isLockedCells(rangeShift1, /*subType*/null, onAddAutoFiltersCallback);
ws.handlers.trigger("selectionChanged", ws.getSelectionInfo());
return;
}
else
......@@ -922,16 +914,11 @@ var gUndoInsDelCellsFlag = true;
onAddAutoFiltersCallback(true);
else
ws._isLockedCells(rangeShift1, /*subType*/null, onAddAutoFiltersCallback);
ws.handlers.trigger("selectionChanged", ws.getSelectionInfo());
return;
}
}
else if(apocal && apocal.containsFilter == false && lTable)
{
ws.handlers.trigger("selectionChanged", ws.getSelectionInfo());
return true;
}
}
......@@ -1057,8 +1044,6 @@ var gUndoInsDelCellsFlag = true;
onAddAutoFiltersCallback(true);
else
ws._isLockedCells(rangeShift1, /*subType*/null, onAddAutoFiltersCallback);
ws.handlers.trigger("selectionChanged", ws.getSelectionInfo());
return;
}
else//выделено > 1 ячейки
......@@ -1086,14 +1071,10 @@ var gUndoInsDelCellsFlag = true;
onAddAutoFiltersCallback(true);
else
ws._isLockedCells(rangeShift1, /*subType*/null, onAddAutoFiltersCallback);
ws.handlers.trigger("selectionChanged", ws.getSelectionInfo());
return;
}
if(openFilter == undefined)
ws.handlers.trigger("selectionChanged", ws.getSelectionInfo());
//устанавливаем стиль для таблицы
if(!isAll && openFilter != undefined)
this._setColorStyleTable(aWs.TableParts[openFilter].Ref, aWs.TableParts[openFilter]);
......@@ -1391,8 +1372,6 @@ var gUndoInsDelCellsFlag = true;
ws.changeWorksheet("update");
if(isTurnOffHistory)
History.TurnOn();
ws.handlers.trigger("selectionChanged", ws.getSelectionInfo());
}
else
return false;
......@@ -6407,7 +6386,6 @@ 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;
}
......@@ -6478,7 +6456,6 @@ 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;
}
......@@ -6493,7 +6470,6 @@ 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