Fix bug caused by changing markLine fromSymbol or toSymbol.

apache · Mar 4, 2016 · 3b9497f · 3b9497f
1 parent d1d567a
commit 3b9497f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/src/chart/helper/Line.js b/src/chart/helper/Line.js
@@ -85,14 +85,14 @@ define(function (require) {
             symbolFrom.attr('position', fromPos);
             // Rotate the arrow
             // FIXME Hard coded ?
-            if (isSymbolArrow(symbolTo)) {
-                symbolTo.attr('rotation', tangentRotation(fromPos, toPos));
+            if (isSymbolArrow(symbolFrom)) {
+                symbolFrom.attr('rotation', tangentRotation(toPos, fromPos));
             }
         }
         if (symbolTo) {
             symbolTo.attr('position', toPos);
-            if (isSymbolArrow(symbolFrom)) {
-                symbolFrom.attr('rotation', tangentRotation(toPos, fromPos));
+            if (isSymbolArrow(symbolTo)) {
+                symbolTo.attr('rotation', tangentRotation(fromPos, toPos));
             }
         }
 
@@ -199,7 +199,7 @@ define(function (require) {
             var fromSymbolType = fromData.getItemVisual(idx, 'symbol');
             if (this._fromSymbolType !== fromSymbolType) {
                 var symbolFrom = createSymbol('fromSymbol', fromData, idx);
-                this.remove(line.childOfName('fromSymbol'));
+                this.remove(this.childOfName('fromSymbol'));
                 this.add(symbolFrom);
             }
             this._fromSymbolType = fromSymbolType;
@@ -209,7 +209,7 @@ define(function (require) {
             // Symbol changed
             if (toSymbolType !== this._toSymbolType) {
                 var symbolTo = createSymbol('toSymbol', toData, idx);
-                this.remove(line.childOfName('toSymbol'));
+                this.remove(this.childOfName('toSymbol'));
                 this.add(symbolTo);
             }
             this._toSymbolType = toSymbolType;

diff --git a/src/chart/map/MapSeries.js b/src/chart/map/MapSeries.js
@@ -69,7 +69,9 @@ define(function (require) {
 
         mergeOption: function (newOption) {
             newOption = this._fillOption(newOption);
-            SeriesModel.prototype.mergeOption.call(this, newOption);
+
+            MapSeries.superCall(this, 'mergeOption', newOption);
+
             this.updateSelectedMap();
         },
 

diff --git a/src/chart/themeRiver/ThemeRiverSeries.js b/src/chart/themeRiver/ThemeRiverSeries.js
@@ -37,13 +37,6 @@ define(function (require) {
             };
         },
 
-        /**
-         * @override
-         */
-        mergeOption: function (newOption) {
-            ThemeRiverSeries.superCall(this, 'mergeOption', newOption);
-        },
-
         /**
          * If there is no value of a certain point in the time for some event,set it value to 0.
          *