Commit f5ea8f2b authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander.Trofimov

когда приходят изменения, они не отрисовывались, если был добавлен sheet.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56895 954022d7-b5bf-4e40-9824-e11837661b57
parent dc290875
......@@ -435,6 +435,9 @@ CHistory.prototype =
}
gUndoInsDelCellsFlag = true;
}
//синхронизация index и id worksheet
if (oRedoObjectParam.bUpdateWorksheetByModel)
this.workbook.handlers.trigger("updateWorksheetByModel");
for (var i in Point.UpdateRigions)
this.workbook.handlers.trigger("cleanCellCache", i, Point.UpdateRigions[i]);
if (bUndo) {
......@@ -453,8 +456,6 @@ CHistory.prototype =
}
for (var i in oRedoObjectParam.oChangeWorksheetUpdate)
this.workbook.handlers.trigger("changeWorksheetUpdate", oRedoObjectParam.oChangeWorksheetUpdate[i]);
if (oRedoObjectParam.bUpdateWorksheetByModel)
this.workbook.handlers.trigger("updateWorksheetByModel");
if (oRedoObjectParam.bOnSheetsChanged)
this.workbook.handlers.trigger("asc_onSheetsChanged");
for (var i in oRedoObjectParam.oOnUpdateTabColor) {
......
......@@ -2628,7 +2628,6 @@ UndoRedoWorkbook.prototype = {
{
var outputParams = {sheet: null, cwf: null};
this.wb.removeWorksheet(Data.insertBefore, outputParams);
this.wb.handlers.trigger("removeWorksheet", Data.insertBefore);
//сохраняем тот sheet который удалили, иначе может возникнуть ошибка, если какой-то обьект запоминал ссылку на sheet(например):
//Добавляем лист -> Добавляем ссылку -> undo -> undo -> redo -> redo
Data.sheet = outputParams.sheet;
......@@ -2664,7 +2663,6 @@ UndoRedoWorkbook.prototype = {
this.wb.copyWorksheet(nIndex, Data.insertBefore, Data.name, Data.sheetid, true);
}
}
this.wb.handlers.trigger("spliceWorksheet", Data.insertBefore, 0, null);
}
}
else if(historyitem_Workbook_SheetRemove == Type)
......@@ -2672,7 +2670,6 @@ UndoRedoWorkbook.prototype = {
if(bUndo)
{
this.wb.insertWorksheet(Data.index, Data.sheet, Data.cwf);
this.wb.handlers.trigger("spliceWorksheet", Data.index, 0, null);
}
else
{
......@@ -2685,7 +2682,6 @@ UndoRedoWorkbook.prototype = {
if(null != nIndex)
{
this.wb.removeWorksheet(nIndex);
this.wb.handlers.trigger("removeWorksheet", nIndex);
}
}
}
......@@ -2694,12 +2690,10 @@ UndoRedoWorkbook.prototype = {
if(bUndo)
{
this.wb.replaceWorksheet(Data.to, Data.from);
this.wb.handlers.trigger("replaceWorksheet", Data.to, Data.from);
}
else
{
this.wb.replaceWorksheet(Data.from, Data.to);
this.wb.handlers.trigger("replaceWorksheet", Data.from, Data.to);
}
}
else if(historyitem_Workbook_SheetPositions == Type)
......
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