chart/base inherits from component/base

rzh · Dec 24, 2014 · ab94664 · ab94664
1 parent 86341c5
commit ab94664
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 70 deletions.
diff --git a/src/chart/bar.js b/src/chart/bar.js
@@ -6,7 +6,6 @@
  *
  */
 define(function (require) {
-    var ComponentBase = require('../component/base');
     var ChartBase = require('./base');
 
     // 图形依赖
@@ -29,10 +28,8 @@ define(function (require) {
      * @param {Object} component 组件
      */
     function Bar(ecTheme, messageCenter, zr, option, myChart){
-        // 基类
-        ComponentBase.call(this, ecTheme, messageCenter, zr, option, myChart);
         // 图表基类
-        ChartBase.call(this);
+        ChartBase.call(this, ecTheme, messageCenter, zr, option, myChart);
 
         this.refresh(option);
     }
@@ -878,7 +875,6 @@ define(function (require) {
     };
 
     zrUtil.inherits(Bar, ChartBase);
-    zrUtil.inherits(Bar, ComponentBase);
 
     // 图表注册
     require('../chart').define('bar', Bar);

diff --git a/src/chart/base.js b/src/chart/base.js
@@ -17,10 +17,15 @@ define(function (require) {
     var ecAnimation = require('../util/ecAnimation');
     var ecEffect = require('../util/ecEffect');
     var accMath = require('../util/accMath');
+    var ComponentBase = require('../component/Base');
+
     var zrUtil = require('zrender/tool/util');
     var zrArea = require('zrender/tool/area');
 
-    function Base(){
+    function Base(ecTheme, messageCenter, zr, option, myChart) {
+
+        ComponentBase.call(this, ecTheme, messageCenter, zr, option, myChart);
+
         var self = this;
         this.selectedMap = {};
         this.lastShapeList = [];
@@ -1595,5 +1600,7 @@ define(function (require) {
         }
     };
 
+    zrUtil.inherits(Base, ComponentBase);
+
     return Base;
 });
diff --git a/src/chart/chord.js b/src/chart/chord.js
@@ -9,7 +9,6 @@
 define(function (require) {
     'use strict';
 
-    var ComponentBase = require('../component/base');
     var ChartBase = require('./base');
 
     // 图形依赖
@@ -28,10 +27,8 @@ define(function (require) {
     var ChordLayout = require('../layout/Chord');
 
     function Chord(ecTheme, messageCenter, zr, option, myChart) {
-        // 基类
-        ComponentBase.call(this, ecTheme, messageCenter, zr, option, myChart);
         // 图表基类
-        ChartBase.call(this);
+        ChartBase.call(this, ecTheme, messageCenter, zr, option, myChart);
 
         this.scaleLineLength = 4;
 
@@ -985,7 +982,6 @@ define(function (require) {
     };
 
     zrUtil.inherits(Chord, ChartBase);
-    zrUtil.inherits(Chord, ComponentBase);
 
     // 图表注册
     require('../chart').define('chord', Chord);

diff --git a/src/chart/eventRiver.js b/src/chart/eventRiver.js
@@ -6,7 +6,6 @@
  *
  */
 define(function (require) {
-    var ComponentBase = require('../component/base');
     var ChartBase = require('./base');
 
     var eventRiverLayout = require('../layout/eventRiver');
@@ -33,10 +32,8 @@ define(function (require) {
      * @param {Object} component 组件
      */
      function EventRiver(ecTheme, messageCenter, zr, option, myChart) {
-         // 基类
-         ComponentBase.call(this, ecTheme, messageCenter, zr, option, myChart);
-         // 图表基类
-         ChartBase.call(this);
+        // 图表基类
+        ChartBase.call(this, ecTheme, messageCenter, zr, option, myChart);
 
          var self = this;
          self._ondragend = function () {
@@ -270,7 +267,6 @@ define(function (require) {
      };
 
      zrUtil.inherits(EventRiver, ChartBase);
-     zrUtil.inherits(EventRiver, ComponentBase);
 
      // 图表注册
      require('../chart').define('eventRiver', EventRiver);

diff --git a/src/chart/force.js b/src/chart/force.js
@@ -8,7 +8,6 @@
 define(function (require) {
     'use strict';
 
-    var ComponentBase = require('../component/base');
     var ChartBase = require('./base');
 
     var Graph = require('../data/Graph');
@@ -35,10 +34,8 @@ define(function (require) {
      */
     function Force(ecTheme, messageCenter, zr, option, myChart) {
         var self = this;
-        // 基类
-        ComponentBase.call(this, ecTheme, messageCenter, zr, option, myChart);
         // 图表基类
-        ChartBase.call(this);
+        ChartBase.call(this, ecTheme, messageCenter, zr, option, myChart);
 
         // 保存节点的位置，改变数据时能够有更好的动画效果
         this.__nodePositionMap = {};
@@ -844,7 +841,6 @@ define(function (require) {
     }
 
     zrUtil.inherits(Force, ChartBase);
-    zrUtil.inherits(Force, ComponentBase);
 
     // 图表注册
     require('../chart').define('force', Force);

diff --git a/src/chart/funnel.js b/src/chart/funnel.js
@@ -6,7 +6,6 @@
  *
  */
 define(function (require) {
-    var ComponentBase = require('../component/base');
     var ChartBase = require('./base');
 
     // 图形依赖
@@ -28,11 +27,9 @@ define(function (require) {
      * @param {Object} series 数据
      * @param {Object} component 组件
      */
-    function Funnel(ecTheme, messageCenter, zr, option, myChart){
-        // 基类
-        ComponentBase.call(this, ecTheme, messageCenter, zr, option, myChart);
+    function Funnel(ecTheme, messageCenter, zr, option, myChart) {
         // 图表基类
-        ChartBase.call(this);
+        ChartBase.call(this, ecTheme, messageCenter, zr, option, myChart);
         this.refresh(option);
     }
 
@@ -731,7 +728,6 @@ define(function (require) {
     };
 
     zrUtil.inherits(Funnel, ChartBase);
-    zrUtil.inherits(Funnel, ComponentBase);
 
     // 图表注册
     require('../chart').define('funnel', Funnel);

diff --git a/src/chart/gauge.js b/src/chart/gauge.js
@@ -6,7 +6,6 @@
  *
  */
 define(function (require) {
-    var ComponentBase = require('../component/base');
     var ChartBase = require('./base');
 
     // 图形依赖
@@ -29,11 +28,9 @@ define(function (require) {
      * @param {Object} series 数据
      * @param {Object} component 组件
      */
-    function Gauge(ecTheme, messageCenter, zr, option, myChart){
-        // 基类
-        ComponentBase.call(this, ecTheme, messageCenter, zr, option, myChart);
+    function Gauge(ecTheme, messageCenter, zr, option, myChart) {
         // 图表基类
-        ChartBase.call(this);
+        ChartBase.call(this, ecTheme, messageCenter, zr, option, myChart);
         this.refresh(option);
     }
 
@@ -548,7 +545,6 @@ define(function (require) {
     };
 
     zrUtil.inherits(Gauge, ChartBase);
-    zrUtil.inherits(Gauge, ComponentBase);
 
     // 图表注册
     require('../chart').define('gauge', Gauge);

diff --git a/src/chart/island.js b/src/chart/island.js
@@ -6,7 +6,6 @@
  *
  */
 define(function (require) {
-    var ComponentBase = require('../component/base');
     var ChartBase = require('./base');
 
     // 图形依赖
@@ -24,10 +23,8 @@ define(function (require) {
      * @param {Object} option 图表选项
      */
     function Island(ecTheme, messageCenter, zr, option, myChart) {
-        // 基类
-        ComponentBase.call(this, ecTheme, messageCenter, zr, {}, myChart);
         // 图表基类
-        ChartBase.call(this);
+        ChartBase.call(this, ecTheme, messageCenter, zr, option, myChart);
 
         this._nameConnector;
         this._valueConnector;
@@ -241,7 +238,6 @@ define(function (require) {
     };
 
     zrUtil.inherits(Island, ChartBase);
-    zrUtil.inherits(Island, ComponentBase);
 
     // 图表注册
     require('../chart').define('island', Island);

diff --git a/src/chart/k.js b/src/chart/k.js
@@ -6,7 +6,6 @@
  *
  */
 define(function (require) {
-    var ComponentBase = require('../component/base');
     var ChartBase = require('./base');
 
     // 图形依赖
@@ -27,11 +26,9 @@ define(function (require) {
      * @param {Object} series 数据
      * @param {Object} component 组件
      */
-    function K(ecTheme, messageCenter, zr, option, myChart){
-        // 基类
-        ComponentBase.call(this, ecTheme, messageCenter, zr, option, myChart);
+    function K(ecTheme, messageCenter, zr, option, myChart) {
         // 图表基类
-        ChartBase.call(this);
+        ChartBase.call(this, ecTheme, messageCenter, zr, option, myChart);
 
         this.refresh(option);
     }
@@ -489,7 +486,6 @@ define(function (require) {
     };
 
     zrUtil.inherits(K, ChartBase);
-    zrUtil.inherits(K, ComponentBase);
 
     // 图表注册
     require('../chart').define('k', K);

diff --git a/src/chart/line.js b/src/chart/line.js
@@ -6,7 +6,6 @@
  *
  */
 define(function (require) {
-    var ComponentBase = require('../component/base');
     var ChartBase = require('./base');
 
     // 图形依赖
@@ -31,10 +30,8 @@ define(function (require) {
      * @param {Object} component 组件
      */
     function Line(ecTheme, messageCenter, zr, option, myChart){
-        // 基类
-        ComponentBase.call(this, ecTheme, messageCenter, zr, option, myChart);
         // 图表基类
-        ChartBase.call(this);
+        ChartBase.call(this, ecTheme, messageCenter, zr, option, myChart);
 
         this.refresh(option);
     }
@@ -929,7 +926,6 @@ define(function (require) {
     IconShape.prototype.iconLibrary['legendLineIcon'] = legendLineIcon;
 
     zrUtil.inherits(Line, ChartBase);
-    zrUtil.inherits(Line, ComponentBase);
 
     // 图表注册
     require('../chart').define('line', Line);

diff --git a/src/chart/map.js b/src/chart/map.js
@@ -6,7 +6,6 @@
  *
  */
 define(function (require) {
-    var ComponentBase = require('../component/base');
     var ChartBase = require('./base');
 
     // 图形依赖
@@ -39,10 +38,8 @@ define(function (require) {
      * @param {Object} component 组件
      */
     function Map(ecTheme, messageCenter, zr, option, myChart){
-        // 基类
-        ComponentBase.call(this, ecTheme, messageCenter, zr, option, myChart);
         // 图表基类
-        ChartBase.call(this);
+        ChartBase.call(this, ecTheme, messageCenter, zr, option, myChart);
 
         var self = this;
         self._onmousewheel = function(params) {
@@ -1528,7 +1525,6 @@ define(function (require) {
     };
 
     zrUtil.inherits(Map, ChartBase);
-    zrUtil.inherits(Map, ComponentBase);
 
     // 图表注册
     require('../chart').define('map', Map);

diff --git a/src/chart/pie.js b/src/chart/pie.js
@@ -6,7 +6,6 @@
  *
  */
 define(function (require) {
-    var ComponentBase = require('../component/base');
     var ChartBase = require('./base');
 
     // 图形依赖
@@ -30,10 +29,8 @@ define(function (require) {
      * @param {Object} component 组件
      */
     function Pie(ecTheme, messageCenter, zr, option, myChart){
-        // 基类
-        ComponentBase.call(this, ecTheme, messageCenter, zr, option, myChart);
         // 图表基类
-        ChartBase.call(this);
+        ChartBase.call(this, ecTheme, messageCenter, zr, option, myChart);
 
         var self = this;
         /**
@@ -1050,7 +1047,6 @@ define(function (require) {
     };
 
     zrUtil.inherits(Pie, ChartBase);
-    zrUtil.inherits(Pie, ComponentBase);
 
     // 图表注册
     require('../chart').define('pie', Pie);

diff --git a/src/chart/radar.js b/src/chart/radar.js
@@ -6,7 +6,6 @@
  */
 
  define(function (require) {
-    var ComponentBase = require('../component/base');
     var ChartBase = require('./base');
 
      // 图形依赖
@@ -29,10 +28,8 @@
      * @exports Radar
      */
     function Radar(ecTheme, messageCenter, zr, option, myChart) {
-        // 基类
-        ComponentBase.call(this, ecTheme, messageCenter, zr, option, myChart);
         // 图表基类
-        ChartBase.call(this);
+        ChartBase.call(this, ecTheme, messageCenter, zr, option, myChart);
 
         this.refresh(option);
     }
@@ -424,7 +421,6 @@
     };
 
     zrUtil.inherits(Radar, ChartBase);
-    zrUtil.inherits(Radar, ComponentBase);
 
     // 图表注册
     require('../chart').define('radar', Radar);

diff --git a/src/chart/scatter.js b/src/chart/scatter.js
@@ -6,7 +6,6 @@
  *
  */
 define(function (require) {
-    var ComponentBase = require('../component/base');
     var ChartBase = require('./base');
 
     // 图形依赖
@@ -29,10 +28,8 @@ define(function (require) {
      * @param {Object} component 组件
      */
     function Scatter(ecTheme, messageCenter, zr, option, myChart){
-        // 基类
-        ComponentBase.call(this, ecTheme, messageCenter, zr, option, myChart);
         // 图表基类
-        ChartBase.call(this);
+        ChartBase.call(this, ecTheme, messageCenter, zr, option, myChart);
 
         this.refresh(option);
     }
@@ -434,7 +431,6 @@ define(function (require) {
     };
 
     zrUtil.inherits(Scatter, ChartBase);
-    zrUtil.inherits(Scatter, ComponentBase);
 
     // 图表注册
     require('../chart').define('scatter', Scatter);