git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@54890 954022d7-b5bf-4e40-9824-e11837661b57

Common/apiCommon.js

@@ -687,9 +687,9 @@
     prot["putLabelsAxisDistance"] = prot.putLabelsAxisDistance              ;
     prot["putMajorTickMark"] = prot.putMajorTickMark                        ;
     prot["putMinorTickMark"] = prot.putMinorTickMark                        ;
-    prot["putTickLabelsPos"] = prot.putTickLablesPos                        ;
-    prot["putCrossesRule"] = prot.putCrossesRule                            ;
-    prot["putCrosses"]                  = prot.putCrosses                   ;
+    prot["putTickLabelsPos"] = prot.putTickLabelsPos;
+    prot["putCrossesRule"] = prot.putCrossesRule;
+    prot["putCrosses"] = prot.putCrosses;
 
 
 
@@ -699,9 +699,10 @@
     prot["getLabelsAxisDistance"] = prot.getLabelsAxisDistance              ;
     prot["getMajorTickMark"] = prot.getMajorTickMark                        ;
     prot["getMinorTickMark"] = prot.getMinorTickMark                        ;
-    prot["getTickLabelsPos"] = prot.getTickLablesPos                        ;
+    prot["getTickLabelsPos"] = prot.getTickLabelsPos                        ;
     prot["getCrossesRule"] = prot.getCrossesRule                            ;
-    prot["getCrosses"]                  = prot.getCrosses                   ;
+    prot["getCrosses"]     = prot.getCrosses                   ;
+
 
 
 }
@@ -710,4 +711,5 @@
 var CColor = window["CColor"];
 var asc_ChartSettings = window["asc_ChartSettings"];
 var asc_AxisSettings = window["asc_AxisSettings"];
-var asc_ValAxisSettings = window["asc_ValAxisSettings"];
\ No newline at end of file
+var asc_ValAxisSettings = window["asc_ValAxisSettings"];
+var asc_CatAxisSettings = window["asc_CatAxisSettings"];
\ No newline at end of file

Excel/menu/menu.js

@@ -3067,5 +3067,34 @@
         }
     );
 
+
+    $(".intervalBetweenLabelsCatAxInput").change(
+        function()
+        {
+            this.value === "auto" ? $("#intervalBetweenLabelsInputCatAxManual").attr("disabled", "disabled") : $("#intervalBetweenLabelsInputCatAxManual").removeAttr("disabled");
+        }
+    );
+
+    $("#crossesAutoCatAxInput").change(
+        function()
+        {
+          $("#crossesCatInput").attr("disabled", "disabled");
+        }
+    );
+
+    $("#crossesMaxAxCatInput").change(
+        function()
+        {
+            $("#crossesCatInput").attr("disabled", "disabled");
+        }
+    );
+
+    $("#crossesCatAxValInput").change(
+        function()
+        {
+            $("#crossesCatInput").removeAttr("disabled");
+        }
+    );
+
 });
 

Excel/model/DrawingObjects/Format/ChartSpacePrototype.js

@@ -638,7 +638,7 @@ CChartSpace.prototype.recalculateMarkers = function()
        || this.chart.plotArea.chart instanceof CScatterChart
        || this.chart.plotArea.chart instanceof CStockChart)
        && this.chart.plotArea.chart.series*/
-       this.chart.plotArea.chart.getObjectType() !== historyitem_type_LineChart || this.chart.plotArea.chart.marker)
+       this.chart.plotArea.chart.getObjectType() !== historyitem_type_LineChart && this.chart.plotArea.chart.getObjectType() !== historyitem_type_RadarChart  || this.chart.plotArea.chart.marker)
     {
         var chart_style = CHART_STYLE_MANAGER.getStyleByIndex(this.style);
         var effect_fill = chart_style.fill1;
@@ -920,7 +920,7 @@ CChartSpace.prototype.recalculateSeriesColors = function()
         }
         else
         {
-            if(!(this.chart.plotArea.chart instanceof CLineChart || this.chart.plotArea.chart instanceof  CScatterChart))
+            if(!(this.chart.plotArea.chart instanceof CLineChart || this.chart.plotArea.chart instanceof  CScatterChart || this.chart.plotArea.chart instanceof CRadarChart))
             {
                 var base_fills = getArrayFillsFromBase(style.fill2, series.length);
                 var base_line_fills = null;
@@ -942,7 +942,6 @@ CChartSpace.prototype.recalculateSeriesColors = function()
                     {
                         pts = [];
                     }
-
                     for(var j = 0; j < pts.length; ++j)
                     {
                         var compiled_brush = new CUniFill();