Commit ec02b6f6 authored by Alexander.Trofimov's avatar Alexander.Trofimov

export EDispBlanksAs -> c_oAscEDispBlanksAs

export SparklineAxisMinMax -> c_oAscSparklineAxisMinMax
parent 054d812c
......@@ -364,6 +364,16 @@ var c_oAscPopUpSelectorType = {
Column: 1,
Stacked: 2
};
var c_oAscEDispBlanksAs = {
Span: 0,
Gap: 1,
Zero: 2
};
var c_oAscSparklineAxisMinMax = {
Individual: 0,
Group: 1,
Custom: 2
};
//----------------------------------------------------------export----------------------------------------------------
window['AscCommonExcel'] = window['AscCommonExcel'] || {};
......@@ -541,4 +551,14 @@ var c_oAscPopUpSelectorType = {
prot['Line'] = prot.Line;
prot['Column'] = prot.Column;
prot['Stacked'] = prot.Stacked;
window['Asc']['c_oAscEDispBlanksAs'] = window['Asc'].c_oAscEDispBlanksAs = c_oAscEDispBlanksAs;
prot = c_oAscEDispBlanksAs;
prot['Span'] = prot.Span;
prot['Gap'] = prot.Gap;
prot['Zero'] = prot.Zero;
window['Asc']['c_oAscSparklineAxisMinMax'] = window['Asc'].c_oAscSparklineAxisMinMax = c_oAscSparklineAxisMinMax;
prot = c_oAscSparklineAxisMinMax;
prot['Individual'] = prot.Individual;
prot['Group'] = prot.Group;
prot['Custom'] = prot.Custom;
})(window);
......@@ -1017,17 +1017,6 @@
yesterday : 'yesterday'
};
var EDispBlanksAs = {
Span: 0,
Gap: 1,
Zero: 2
};
var SparklineAxisMinMax = {
Individual: 0,
Group: 1,
Custom: 2
};
var g_nNumsMaxId = 160;
var DocumentPageSize = new function() {
......@@ -8135,8 +8124,6 @@
window["AscCommonExcel"].ECfType = ECfType;
window["AscCommonExcel"].ECfvoType = ECfvoType;
window["AscCommonExcel"].ST_TimePeriod = ST_TimePeriod;
window["Asc"].EDispBlanksAs = EDispBlanksAs;
window["Asc"].SparklineAxisMinMax = SparklineAxisMinMax;
window["Asc"].CTableStyles = CTableStyles;
window["Asc"].CTableStyle = CTableStyle;
......
......@@ -4560,7 +4560,7 @@ CellArea.prototype = {
this.lineWeight = 0.75;
this.type = Asc.c_oAscSparklineType.Line;
this.dateAxis = false;
this.displayEmptyCellsAs = Asc.EDispBlanksAs.Zero;
this.displayEmptyCellsAs = Asc.c_oAscEDispBlanksAs.Zero;
this.markers = false;
this.high = false;
this.low = false;
......@@ -4569,8 +4569,8 @@ CellArea.prototype = {
this.negative = false;
this.displayXAxis = false;
this.displayHidden = false;
this.minAxisType = Asc.SparklineAxisMinMax.Individual;
this.maxAxisType = Asc.SparklineAxisMinMax.Individual;
this.minAxisType = Asc.c_oAscSparklineAxisMinMax.Individual;
this.maxAxisType = Asc.c_oAscSparklineAxisMinMax.Individual;
this.rightToLeft = false;
// elements
......
......@@ -328,17 +328,17 @@ CSparklineView.prototype.initFromSparkline = function(oSparkline, oSparklineGrou
{
switch(oSparklineGroup.displayEmptyCellsAs)
{
case Asc.EDispBlanksAs.Span:
case Asc.c_oAscEDispBlanksAs.Span:
{
chart_space.displayEmptyCellsAs = 0;
break;
}
case Asc.EDispBlanksAs.Gap:
case Asc.c_oAscEDispBlanksAs.Gap:
{
chart_space.displayEmptyCellsAs = 1;
break;
}
case Asc.EDispBlanksAs.Zero:
case Asc.c_oAscEDispBlanksAs.Zero:
{
chart_space.displayEmptyCellsAs = 2;
break;
......@@ -356,7 +356,7 @@ CSparklineView.prototype.initFromSparkline = function(oSparkline, oSparklineGrou
var val_ax_props = new AscCommon.asc_ValAxisSettings();
if(settings.type !== c_oAscChartTypeSettings.barStackedPer)
{
if(oSparklineGroup.minAxisType === Asc.SparklineAxisMinMax.Custom && oSparklineGroup.manualMin != null)
if(oSparklineGroup.minAxisType === Asc.c_oAscSparklineAxisMinMax.Custom && oSparklineGroup.manualMin != null)
{
val_ax_props.putMinValRule(c_oAscValAxisRule.fixed);
val_ax_props.putMinVal(oSparklineGroup.manualMin);
......@@ -365,7 +365,7 @@ CSparklineView.prototype.initFromSparkline = function(oSparkline, oSparklineGrou
{
val_ax_props.putMinValRule(c_oAscValAxisRule.auto);
}
if(oSparklineGroup.maxAxisType === Asc.SparklineAxisMinMax.Custom && oSparklineGroup.manualMax != null)
if(oSparklineGroup.maxAxisType === Asc.c_oAscSparklineAxisMinMax.Custom && oSparklineGroup.manualMax != null)
{
val_ax_props.putMinValRule(c_oAscValAxisRule.fixed);
val_ax_props.putMinVal(oSparklineGroup.manualMax);
......@@ -2392,7 +2392,7 @@ function DrawingObjects() {
{
var maxVal = null, minVal = null, i, j;
if(oSparklineGroup.type !== Asc.c_oAscSparklineType.Stacked &&
(Asc.SparklineAxisMinMax.Group === oSparklineGroup.minAxisType || Asc.SparklineAxisMinMax.Group === oSparklineGroup.maxAxisType))
(Asc.c_oAscSparklineAxisMinMax.Group === oSparklineGroup.minAxisType || Asc.SparklineAxisMinMax.Group === oSparklineGroup.maxAxisType))
{
for(i = 0; i < oSparklineGroup.arrSparklines.length; ++i)
{
......@@ -2404,7 +2404,7 @@ function DrawingObjects() {
var aPoints = AscFormat.getPtsFromSeries(oSparklineGroup.arrCachedSparklines[i].chartSpace.chart.plotArea.charts[0].series[0]);
for(j = 0; j < aPoints.length; ++j)
{
if(Asc.SparklineAxisMinMax.Group === oSparklineGroup.maxAxisType)
if(Asc.c_oAscSparklineAxisMinMax.Group === oSparklineGroup.maxAxisType)
{
if(maxVal === null)
{
......@@ -2418,7 +2418,7 @@ function DrawingObjects() {
}
}
}
if(Asc.SparklineAxisMinMax.Group === oSparklineGroup.minAxisType)
if(Asc.c_oAscSparklineAxisMinMax.Group === oSparklineGroup.minAxisType)
{
if(minVal === null)
{
......@@ -2466,7 +2466,7 @@ function DrawingObjects() {
var oSparklineGroup = aSparklineGroups[i];
if(oSparklineGroup.type !== Asc.c_oAscSparklineType.Stacked &&
(Asc.SparklineAxisMinMax.Group === oSparklineGroup.minAxisType || Asc.SparklineAxisMinMax.Group === oSparklineGroup.maxAxisType))
(Asc.c_oAscSparklineAxisMinMax.Group === oSparklineGroup.minAxisType || Asc.SparklineAxisMinMax.Group === oSparklineGroup.maxAxisType))
{
_this.checkSparklineGroupMinMaxVal(oSparklineGroup);
}
......
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