Commit 709a5eed authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Поправил проверку для изменений (теперь они приходят как массив массивов).

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56859 954022d7-b5bf-4e40-9824-e11837661b57
parent 666baa81
......@@ -2642,7 +2642,7 @@ CChartsDrawer.prototype =
{
manualMin = chartProp.chart.plotArea.valAx && chartProp.chart.plotArea.valAx.scaling && chartProp.chart.plotArea.valAx.scaling.min !== null ? chartProp.chart.plotArea.valAx.scaling.min : null;
manualMax = chartProp.chart.plotArea.valAx && chartProp.chart.plotArea.valAx.scaling && chartProp.chart.plotArea.valAx.scaling.max !== null ? chartProp.chart.plotArea.valAx.scaling.max : null;
};
}
if(this.calcProp.subType == 'stackedPer' && manualMin != null)
manualMin = manualMin * 100;
......@@ -2676,7 +2676,7 @@ CChartsDrawer.prototype =
firstStep = step;
step = step * firstDegree.numPow;
};
}
if(isNaN(step) || step === 0)
{
......
......@@ -1591,10 +1591,10 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
var oRecalcIndexColumns = null, oRecalcIndexRows = null;
for (; nIndex < nCount; ++nIndex) {
oElement = e[nIndex];
if ("string" === typeof oElement) {
if (!oElement.hasOwnProperty("type")) {
t.collaborativeEditing.addChanges(oElement);
bAddChanges = true;
} else if (false !== bSendEvent && "object" === typeof oElement) {
} else if (false !== bSendEvent) {
if ("0" === oElement["type"]) {
// Это мы получили recalcIndexColumns
oRecalcIndexColumns = t.collaborativeEditing.addRecalcIndex(oElement["type"], oElement["index"]);
......
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