Bug 24995 - [CoEdit] Не пропадает ромашка 'Loading the changes' при передачи chart

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

Common/Drawings/Format/ChartFormat.js

@@ -3082,6 +3082,22 @@ CAreaChart.prototype =
                 this.varyColors = data.oldPr;
                 break
             }
+            case historyitem_AreaChart_AddSer:
+            {
+                for(var i = this.series.length - 1; i >- 1; --i)
+                {
+                    if(this.series[i] === data.ser)
+                    {
+                        this.series.splice(i, 1);
+                        break;
+                    }
+                }
+                if(this.parent && this.parent.parent && this.parent.parent.parent)
+                {
+                    this.parent.parent.parent.handleUpdateType();
+                }
+                break;
+            }
         }
     },
 
@@ -3132,6 +3148,18 @@ CAreaChart.prototype =
                 this.varyColors = data.newPr;
                 break
             }
+            case historyitem_AreaChart_AddSer:
+            {
+                if(isRealObject(data.ser))
+                {
+                    this.series.push(data.ser);
+                }
+                if(this.parent && this.parent.parent && this.parent.parent.parent)
+                {
+                    this.parent.parent.parent.handleUpdateType();
+                }
+                break;
+            }
         }
     },
 
@@ -3168,6 +3196,11 @@ CAreaChart.prototype =
                 writeBool(w, data.newPr);
                 break
             }
+            case historyitem_AreaChart_AddSer:
+            {
+                writeObject(w, data.ser);
+                break;
+            }
         }
     },
 
@@ -3225,6 +3258,19 @@ CAreaChart.prototype =
                 this.varyColors = readBool(r);
                 break
             }
+            case historyitem_AreaChart_AddSer:
+            {
+                var ser = readObject(r);
+                if(isRealObject(ser))
+                {
+                    this.series.push(ser);
+                }
+                if(this.parent && this.parent.parent && this.parent.parent.parent)
+                {
+                    this.parent.parent.parent.handleUpdateType();
+                }
+                break;
+            }
         }
     }
 };
@@ -3257,8 +3303,6 @@ CAreaSeries.prototype =
     },
 
 
-
-
     Refresh_RecalcData: function()
     {},
 
@@ -3599,13 +3643,13 @@ CAreaSeries.prototype =
     },
     setTx: function(pr)
     {
-        History.Add(this, {Type: historyitem_AreaSeries_SetTrendline, oldPr: this.trendline, newPr: pr});
+        History.Add(this, {Type: historyitem_AreaSeries_SetTx, oldPr: this.trendline, newPr: pr});
         this.tx = pr;
     },
 
     setVal: function(pr)
     {
-        History.Add(this, {Type: historyitem_AreaSeries_SetTrendline, oldPr: this.trendline, newPr: pr});
+        History.Add(this, {Type: historyitem_AreaSeries_SetVal, oldPr: this.trendline, newPr: pr});
         this.val = pr;
     },
 
@@ -3674,6 +3718,16 @@ CAreaSeries.prototype =
                 this.trendline = data.oldPr;
                 break;
             }
+            case historyitem_AreaSeries_SetTx:
+            {
+                this.tx = data.oldPr;
+                break;
+            }
+            case historyitem_AreaSeries_SetVal:
+            {
+                this.val = data.oldPr;
+                break;
+            }
         }
     },
 
@@ -3736,6 +3790,16 @@ CAreaSeries.prototype =
                 this.trendline = data.newPr;
                 break;
             }
+            case historyitem_AreaSeries_SetTx:
+            {
+                this.tx = data.newPr;
+                break;
+            }
+            case historyitem_AreaSeries_SetVal:
+            {
+                this.val = data.newPr;
+                break;
+            }
         }
     },
 
@@ -3756,6 +3820,8 @@ CAreaSeries.prototype =
             case historyitem_AreaSeries_SetPictureOptions:
             case historyitem_AreaSeries_SetSpPr:
             case historyitem_AreaSeries_SetTrendline:
+            case historyitem_AreaSeries_SetTx:
+            case historyitem_AreaSeries_SetVal:
             {
                 writeObject(w, data.newPr);
                 break;
@@ -3838,6 +3904,17 @@ CAreaSeries.prototype =
                 }
                 break;
             }
+
+            case historyitem_AreaSeries_SetTx:
+            {
+                this.tx = readObject(r);
+                break;
+            }
+            case historyitem_AreaSeries_SetVal:
+            {
+                this.val = readObject(r);
+                break;
+            }
         }
     }
 };

Common/Drawings/Format/Constants.js

@@ -369,6 +369,8 @@ var historyitem_AreaSeries_SetOrder                     = 2343;
 var historyitem_AreaSeries_SetPictureOptions            = 2344;
 var historyitem_AreaSeries_SetSpPr                      = 2345;
 var historyitem_AreaSeries_SetTrendline                 = 2346;
+var historyitem_AreaSeries_SetTx                        = 2347;
+var historyitem_AreaSeries_SetVal                       = 2348;
 var historyitem_Cat_SetMultiLvlStrRef                   = 2347;
 var historyitem_Cat_SetNumLit                           = 2348;
 var historyitem_Cat_SetNumRef                           = 2349;