Баг с маркером в линейной диаграмме.

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

Common/Drawings/CommonController.js

@@ -2909,43 +2909,34 @@ DrawingObjectsController.prototype =
             {
                 chartSettings.bLine = true;
             }
+               
             if(chartSettings.showMarker)
             {
-                //for(var j = 0; j < chart_type.series.length; ++j)
-                //{
-                //    chart_type.series[j].setMarker(null);
-                //}
-                if(chartSettings.showMarker === true)
+                if(!chart_type.marker)
                 {
-                    if(!chart_type.marker)
-                    {
-                        chart_type.setMarker(true);
-                    }
+                    chart_type.setMarker(true);
                 }
-                if(chartSettings.showMarker)
+                for(var j = 0; j < chart_type.series.length; ++j)
                 {
-                    for(var j = 0; j < chart_type.series.length; ++j)
+                    if(chart_type.series[j].marker)
                     {
-                        if(chart_type.series[j].marker)
-                        {
-                            chart_type.series[j].setMarker(null);
-                        }
+                        chart_type.series[j].setMarker(null);
                     }
                 }
-                else
+            }
+            else
+            {
+                for(var j = 0; j < chart_type.series.length; ++j)
                 {
-                    for(var j = 0; j < chart_type.series.length; ++j)
+                    if(!chart_type.series[j].marker)
                     {
                         if(!chart_type.series[j].marker)
                         {
-                            if(!chart_type.series[j].marker)
-                            {
-                                chart_type.series[j].setMarker(new CMarker());
-                            }
-                            if(chart_type.series[j].marker.symbol !== SYMBOL_NONE)
-                            {
-                                chart_type.series[j].marker.setSymbol(SYMBOL_NONE);
-                            }
+                            chart_type.series[j].setMarker(new CMarker());
+                        }
+                        if(chart_type.series[j].marker.symbol !== SYMBOL_NONE)
+                        {
+                            chart_type.series[j].marker.setSymbol(SYMBOL_NONE);
                         }
                     }
                 }