Commit 3539a8ed authored by GoshaZotov's avatar GoshaZotov

add in history advancedSettings(format table)

parent 3b433934
...@@ -249,8 +249,8 @@ ...@@ -249,8 +249,8 @@
this.Properties = g_oAdvancedTableInfoSettings; this.Properties = g_oAdvancedTableInfoSettings;
this.title = null; this.title = undefined;
this.description = null; this.description = undefined;
return this; return this;
} }
...@@ -2471,8 +2471,8 @@ ...@@ -2471,8 +2471,8 @@
History.Create_NewPoint(); History.Create_NewPoint();
History.StartTransaction(); History.StartTransaction();
//History.TurnOff();
var oldFilter = tablePart.clone(null); var oldFilter = tablePart.clone(null);
var bAddHistoryPoint = true;
switch(optionType) switch(optionType)
{ {
...@@ -2594,18 +2594,30 @@ ...@@ -2594,18 +2594,30 @@
case c_oAscChangeTableStyleInfo.advancedSettings: case c_oAscChangeTableStyleInfo.advancedSettings:
{ {
var title = val.asc_getTitle() var title = val.asc_getTitle()
var description = val.asc_getDescription() var description = val.asc_getDescription();
tablePart.changeAltText(title);
tablePart.changeAltTextSummary(description); //если ничего не меняется в advancedSettings, не заносим точку в историю
bAddHistoryPoint = false;
if(undefined !== title)
{
tablePart.changeAltText(title);
bAddHistoryPoint = true;
}
if(undefined !== description)
{
tablePart.changeAltTextSummary(description);
bAddHistoryPoint = true;
}
break; break;
} }
} }
//History.TurnOn(); if(bAddHistoryPoint)
{
this._addHistoryObj({oldFilter: oldFilter, newFilterRef: tablePart.Ref.clone()}, AscCH.historyitem_AutoFilter_ChangeTableInfo, this._addHistoryObj({oldFilter: oldFilter, newFilterRef: tablePart.Ref.clone()}, AscCH.historyitem_AutoFilter_ChangeTableInfo,
{activeCells: tablePart.Ref.clone(), type: optionType, val: val, displayName: tableName}); {activeCells: tablePart.Ref.clone(), type: optionType, val: val, displayName: tableName});
}
this._cleanStyleTable(tablePart.Ref); this._cleanStyleTable(tablePart.Ref);
this._setColorStyleTable(tablePart.Ref, tablePart, null, isSetValue, isSetType); this._setColorStyleTable(tablePart.Ref, tablePart, null, isSetValue, isSetType);
......
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