Skip to content

Commit

Permalink
fix co-edit with chart-ex
Browse files Browse the repository at this point in the history
  • Loading branch information
@SergeyLuzyanin
SergeyLuzyanin committed Oct 2, 2024
1 parent 38b8156 commit fce4e97
Show file tree
Hide file tree
Showing 3 changed files with 77 additions and 14 deletions.
4 changes: 2 additions & 2 deletions common/Drawings/Format/ChartSpace.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ function(window, undefined) {
AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetNvGrFrProps] = CChangesDrawingsObject;
AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetThemeOverride] = CChangesDrawingsObject;
AscDFH.changesFactory[AscDFH.historyitem_ShapeSetBDeleted] = CChangesDrawingsBool;
AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetChartData] = CChangesDrawingsObjectNoId;
AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetChartData] = CChangesDrawingsObject;
AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetParent] = CChangesDrawingsObject;
AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetChart] = CChangesDrawingsObject;
AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetClrMapOvr] = CChangesDrawingsObject;
Expand Down Expand Up @@ -1777,7 +1777,7 @@ function(window, undefined) {
return this.dataRefs;
};
CChartSpace.prototype.setChartData = function(pr) {
History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetChartData, this.chartData, pr));
History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_ChartSpace_SetChartData, this.chartData, pr));
this.chartData = pr;
};
CChartSpace.prototype.clearDataRefs = function () {
Expand Down
25 changes: 13 additions & 12 deletions common/HistoryCommon.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2541,6 +2541,7 @@
window['AscDFH'].historyitem_ChartSpace_RemoveUserShape = window['AscDFH'].historyitem_type_ChartSpace | 19;
window['AscDFH'].historyitem_ChartSpace_ChartStyle = window['AscDFH'].historyitem_type_ChartSpace | 20;
window['AscDFH'].historyitem_ChartSpace_ChartColors = window['AscDFH'].historyitem_type_ChartSpace | 21;
window['AscDFH'].historyitem_ChartSpace_SetChartData = window['AscDFH'].historyitem_type_ChartSpace | 22;

window['AscDFH'].historyitem_Legend_SetLayout = window['AscDFH'].historyitem_type_Legend | 1;
window['AscDFH'].historyitem_Legend_AddLegendEntry = window['AscDFH'].historyitem_type_Legend | 2;
Expand Down Expand Up @@ -2593,18 +2594,18 @@
window['AscDFH'].historyitem_Marker_SetSpPr = window['AscDFH'].historyitem_type_Marker | 2;
window['AscDFH'].historyitem_Marker_SetSymbol = window['AscDFH'].historyitem_type_Marker | 3;

window['AscDFH'].historyitem_PlotArea_AddChart = window['AscDFH'].historyitem_type_PlotArea | 1;
window['AscDFH'].historyitem_PlotArea_SetCatAx = window['AscDFH'].historyitem_type_PlotArea | 2;
window['AscDFH'].historyitem_PlotArea_SetDateAx = window['AscDFH'].historyitem_type_PlotArea | 3;
window['AscDFH'].historyitem_PlotArea_SetDTable = window['AscDFH'].historyitem_type_PlotArea | 4;
window['AscDFH'].historyitem_PlotArea_SetLayout = window['AscDFH'].historyitem_type_PlotArea | 5;
window['AscDFH'].historyitem_PlotArea_SetSerAx = window['AscDFH'].historyitem_type_PlotArea | 6;
window['AscDFH'].historyitem_PlotArea_SetSpPr = window['AscDFH'].historyitem_type_PlotArea | 7;
window['AscDFH'].historyitem_PlotArea_SetValAx = window['AscDFH'].historyitem_type_PlotArea | 8;
window['AscDFH'].historyitem_PlotArea_AddAxis = window['AscDFH'].historyitem_type_PlotArea | 9;
window['AscDFH'].historyitem_PlotArea_RemoveChart = window['AscDFH'].historyitem_type_PlotArea | 10;
window['AscDFH'].historyitem_PlotArea_RemoveAxis = window['AscDFH'].historyitem_type_PlotArea | 11;
window['AscDFH'].historyitem_PlotArea_SetPlotAreaRegion = window['AscDFH'].historyitem_type_PlotArea | 11;
window['AscDFH'].historyitem_PlotArea_AddChart = window['AscDFH'].historyitem_type_PlotArea | 1;
window['AscDFH'].historyitem_PlotArea_SetCatAx = window['AscDFH'].historyitem_type_PlotArea | 2;
window['AscDFH'].historyitem_PlotArea_SetDateAx = window['AscDFH'].historyitem_type_PlotArea | 3;
window['AscDFH'].historyitem_PlotArea_SetDTable = window['AscDFH'].historyitem_type_PlotArea | 4;
window['AscDFH'].historyitem_PlotArea_SetLayout = window['AscDFH'].historyitem_type_PlotArea | 5;
window['AscDFH'].historyitem_PlotArea_SetSerAx = window['AscDFH'].historyitem_type_PlotArea | 6;
window['AscDFH'].historyitem_PlotArea_SetSpPr = window['AscDFH'].historyitem_type_PlotArea | 7;
window['AscDFH'].historyitem_PlotArea_SetValAx = window['AscDFH'].historyitem_type_PlotArea | 8;
window['AscDFH'].historyitem_PlotArea_AddAxis = window['AscDFH'].historyitem_type_PlotArea | 9;
window['AscDFH'].historyitem_PlotArea_RemoveChart = window['AscDFH'].historyitem_type_PlotArea | 10;
window['AscDFH'].historyitem_PlotArea_RemoveAxis = window['AscDFH'].historyitem_type_PlotArea | 11;
window['AscDFH'].historyitem_PlotArea_SetPlotAreaRegion = window['AscDFH'].historyitem_type_PlotArea | 12;

window['AscDFH'].historyitem_NumFmt_SetFormatCode = window['AscDFH'].historyitem_type_NumFmt | 1;
window['AscDFH'].historyitem_NumFmt_SetSourceLinked = window['AscDFH'].historyitem_type_NumFmt | 2;
Expand Down
62 changes: 62 additions & 0 deletions common/TableId.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,68 @@
}

this.m_oFactoryClass[AscDFH.historyitem_type_DocumentMacros] = AscCommon.CDocumentMacros;


this.m_oFactoryClass[AscDFH.historyitem_type_Address] = AscFormat.CAddress;
this.m_oFactoryClass[AscDFH.historyitem_type_Axis] = AscFormat.CAxis;
this.m_oFactoryClass[AscDFH.historyitem_type_AxisUnits] = AscFormat.CAxisUnits;
this.m_oFactoryClass[AscDFH.historyitem_type_AxisUnitsLabel] = AscFormat.CAxisUnitsLabel;
this.m_oFactoryClass[AscDFH.historyitem_type_Binning] = AscFormat.CBinning;
this.m_oFactoryClass[AscDFH.historyitem_type_CategoryAxisScaling] = AscFormat.CCategoryAxisScaling;
this.m_oFactoryClass[AscDFH.historyitem_type_ChartData] = AscFormat.CChartData;
this.m_oFactoryClass[AscDFH.historyitem_type_Clear] = AscFormat.CClear;
this.m_oFactoryClass[AscDFH.historyitem_type_Copyrights] = AscFormat.CCopyrights;
this.m_oFactoryClass[AscDFH.historyitem_type_Data] = AscFormat.CData;
this.m_oFactoryClass[AscDFH.historyitem_type_DataLabel] = AscFormat.CDataLabel;
this.m_oFactoryClass[AscDFH.historyitem_type_DataLabelHidden] = AscFormat.CDataLabelHidden;
this.m_oFactoryClass[AscDFH.historyitem_type_DataLabels] = AscFormat.CDataLabels;
this.m_oFactoryClass[AscDFH.historyitem_type_DataLabelVisibilities] = AscFormat.CDataLabelVisibilities;
this.m_oFactoryClass[AscDFH.historyitem_type_DataPoint] = AscFormat.CDataPoint;
this.m_oFactoryClass[AscDFH.historyitem_type_FormatOverride] = AscFormat.CFormatOverride;
this.m_oFactoryClass[AscDFH.historyitem_type_FormatOverrides] = AscFormat.CFormatOverrides;
this.m_oFactoryClass[AscDFH.historyitem_type_Formula] = AscFormat.CFormula;
this.m_oFactoryClass[AscDFH.historyitem_type_GeoCache] = AscFormat.CGeoCache;
this.m_oFactoryClass[AscDFH.historyitem_type_GeoChildEntities] = AscFormat.CGeoChildEntities;
this.m_oFactoryClass[AscDFH.historyitem_type_GeoChildEntitiesQuery] = AscFormat.CGeoChildEntitiesQuery;
this.m_oFactoryClass[AscDFH.historyitem_type_GeoChildEntitiesQueryResult] = AscFormat.CGeoChildEntitiesQueryResult;
this.m_oFactoryClass[AscDFH.historyitem_type_GeoChildEntitiesQueryResults] = AscFormat.CGeoChildEntitiesQueryResults;
this.m_oFactoryClass[AscDFH.historyitem_type_GeoChildTypes] = AscFormat.CGeoChildTypes;
this.m_oFactoryClass[AscDFH.historyitem_type_GeoData] = AscFormat.CGeoData;
this.m_oFactoryClass[AscDFH.historyitem_type_GeoDataEntityQuery] = AscFormat.CGeoDataEntityQuery;
this.m_oFactoryClass[AscDFH.historyitem_type_GeoDataEntityQueryResult] = AscFormat.CGeoDataEntityQueryResult;
this.m_oFactoryClass[AscDFH.historyitem_type_GeoDataEntityQueryResults] = AscFormat.CGeoDataEntityQueryResults;
this.m_oFactoryClass[AscDFH.historyitem_type_GeoDataPointQuery] = AscFormat.CGeoDataPointQuery;
this.m_oFactoryClass[AscDFH.historyitem_type_GeoDataPointToEntityQuery] = AscFormat.CGeoDataPointToEntityQuery;
this.m_oFactoryClass[AscDFH.historyitem_type_GeoDataPointToEntityQueryResult] = AscFormat.CGeoDataPointToEntityQueryResult;
this.m_oFactoryClass[AscDFH.historyitem_type_GeoDataPointToEntityQueryResults] = AscFormat.CGeoDataPointToEntityQueryResults;
this.m_oFactoryClass[AscDFH.historyitem_type_Geography] = AscFormat.CGeography;
this.m_oFactoryClass[AscDFH.historyitem_type_GeoHierarchyEntity] = AscFormat.CGeoHierarchyEntity;
this.m_oFactoryClass[AscDFH.historyitem_type_GeoLocation] = AscFormat.CGeoLocation;
this.m_oFactoryClass[AscDFH.historyitem_type_GeoLocationQuery] = AscFormat.CGeoLocationQuery;
this.m_oFactoryClass[AscDFH.historyitem_type_GeoLocationQueryResult] = AscFormat.CGeoLocationQueryResult;
this.m_oFactoryClass[AscDFH.historyitem_type_GeoLocationQueryResults] = AscFormat.CGeoLocationQueryResults;
this.m_oFactoryClass[AscDFH.historyitem_type_GeoLocations] = AscFormat.CGeoLocations;
this.m_oFactoryClass[AscDFH.historyitem_type_GeoPolygon] = AscFormat.CGeoPolygon;
this.m_oFactoryClass[AscDFH.historyitem_type_GeoPolygons] = AscFormat.CGeoPolygons;
this.m_oFactoryClass[AscDFH.historyitem_type_Gridlines] = AscFormat.CGridlines;
this.m_oFactoryClass[AscDFH.historyitem_type_Dimension] = AscFormat.CDimension;
this.m_oFactoryClass[AscDFH.historyitem_type_NumericDimension] = AscFormat.CNumericDimension;
this.m_oFactoryClass[AscDFH.historyitem_type_PercentageColorPosition] = AscFormat.CPercentageColorPosition;
this.m_oFactoryClass[AscDFH.historyitem_type_PlotAreaRegion] = AscFormat.CPlotAreaRegion;
this.m_oFactoryClass[AscDFH.historyitem_type_PlotSurface] = AscFormat.CPlotSurface;
this.m_oFactoryClass[AscDFH.historyitem_type_Series] = AscFormat.CSeries;
this.m_oFactoryClass[AscDFH.historyitem_type_SeriesElementVisibilities] = AscFormat.CSeriesElementVisibilities;
this.m_oFactoryClass[AscDFH.historyitem_type_SeriesLayoutProperties] = AscFormat.CSeriesLayoutProperties;
this.m_oFactoryClass[AscDFH.historyitem_type_Statistics] = AscFormat.CStatistics;
this.m_oFactoryClass[AscDFH.historyitem_type_StringDimension] = AscFormat.CStringDimension;
this.m_oFactoryClass[AscDFH.historyitem_type_Subtotals] = AscFormat.CSubtotals;
this.m_oFactoryClass[AscDFH.historyitem_type_TextData] = AscFormat.CTextData;
this.m_oFactoryClass[AscDFH.historyitem_type_TickMarks] = AscFormat.CTickMarks;
this.m_oFactoryClass[AscDFH.historyitem_type_ValueAxisScaling] = AscFormat.CValueAxisScaling;
this.m_oFactoryClass[AscDFH.historyitem_type_ValueColorEndPosition] = AscFormat.CValueColorEndPosition;
this.m_oFactoryClass[AscDFH.historyitem_type_ValueColorMiddlePosition] = AscFormat.CValueColorMiddlePosition;
this.m_oFactoryClass[AscDFH.historyitem_type_ValueColorPositions] = AscFormat.CValueColorPositions;
this.m_oFactoryClass[AscDFH.historyitem_type_ValueColors] = AscFormat.CValueColors;

this.InitOFormClasses();
};
Expand Down

0 comments on commit fce4e97

Please sign in to comment.