From ae92eba9a7b63da76116b3735c9d45b5ce572a65 Mon Sep 17 00:00:00 2001 From: lang Date: Tue, 15 Sep 2015 15:08:01 +0800 Subject: [PATCH] Remove unused code --- src/component/dataZoom/dataZoomProcessor.js | 30 ++++++++-------- src/coord/cartesian/AxisModel.js | 39 +-------------------- src/coord/cartesian/Grid.js | 2 +- src/coord/polar/AxisModel.js | 39 +-------------------- 4 files changed, 18 insertions(+), 92 deletions(-) diff --git a/src/component/dataZoom/dataZoomProcessor.js b/src/component/dataZoom/dataZoomProcessor.js index ff8d3971a..608e822eb 100644 --- a/src/component/dataZoom/dataZoomProcessor.js +++ b/src/component/dataZoom/dataZoomProcessor.js @@ -82,21 +82,21 @@ define(function (require) { function calculateDataExtent(dimNames, axisModel, seriesModels) { var dataExtent = [Number.MAX_VALUE, Number.MIN_VALUE]; - if (axisModel.get('type') === 'category') { - // Only category axis has property 'data's. - var axisData = axisModel.getData() || []; - dataExtent = [0, axisData.length]; - } - else { - zrUtil.each(seriesModels, function (seriesModel) { - var seriesData = seriesModel.getData(); - if (seriesData) { - var seriesExtent = seriesData.getDataExtent(dimNames.dim); - seriesExtent[0] < dataExtent[0] && (dataExtent[0] = seriesExtent[0]); - seriesExtent[1] > dataExtent[1] && (dataExtent[1] = seriesExtent[1]); - } - }, this); - } + // if (axisModel.get('type') === 'category') { + // // Only category axis has property 'data's. + // var axisData = axisModel.getData() || []; + // dataExtent = [0, axisData.length]; + // } + // else { + zrUtil.each(seriesModels, function (seriesModel) { + var seriesData = seriesModel.getData(); + if (seriesData) { + var seriesExtent = seriesData.getDataExtent(dimNames.dim); + seriesExtent[0] < dataExtent[0] && (dataExtent[0] = seriesExtent[0]); + seriesExtent[1] > dataExtent[1] && (dataExtent[1] = seriesExtent[1]); + } + }, this); + // } return dataExtent; } diff --git a/src/coord/cartesian/AxisModel.js b/src/coord/cartesian/AxisModel.js index 809b590eb..0410ad7c6 100644 --- a/src/coord/cartesian/AxisModel.js +++ b/src/coord/cartesian/AxisModel.js @@ -21,44 +21,7 @@ define(function(require) { /** * @type {module:echarts/coord/cartesian/Axis2D} */ - axis: null, - - /** - * @override - */ - init: function () { - ComponentModel.prototype.init.call(this); - - var data = this.getData(); - if (data) { - // FIXME - // clone? - /** - * @type {Array} - * @private - */ - this._dataBeforeProcessing = data.slice(); - } - }, - - /** - * @public - * @return {Array=} data Can be null - */ - getData: function () { - return this.get('data'); - }, - - /** - * @override - */ - restoreData: function () { - // FIXME - // clone? - if (this._dataBeforeProcessing) { - this.option.data = this._dataBeforeProcessing.slice(); - } - } + axis: null }); zrUtil.merge(AxisModel.prototype, require('../axisModelCommonMixin')); diff --git a/src/coord/cartesian/Grid.js b/src/coord/cartesian/Grid.js index 98465a52c..428b64510 100644 --- a/src/coord/cartesian/Grid.js +++ b/src/coord/cartesian/Grid.js @@ -25,7 +25,7 @@ define(function(require, factory) { if (axisType) { return axisType === 'category' // Give [Infinity, -Infinity] extent to make the unionExtent is right - ? new OrdinalScale(axisModel.getData(), [Infinity, -Infinity]) + ? new OrdinalScale(axisModel.get('data'), [Infinity, -Infinity]) : new IntervalScale(); } } diff --git a/src/coord/polar/AxisModel.js b/src/coord/polar/AxisModel.js index cd16dcd12..edf1e74af 100644 --- a/src/coord/polar/AxisModel.js +++ b/src/coord/polar/AxisModel.js @@ -19,44 +19,7 @@ define(function(require) { /** * @type {module:echarts/coord/polar/AngleAxis|module:echarts/coord/polar/RadiusAxis} */ - axis: null, - - /** - * @override - */ - init: function () { - ComponentModel.prototype.init.call(this); - - var data = this.getData(); - if (data) { - // FIXME - // clone? - /** - * @type {Array} - * @private - */ - this._dataBeforeProcessing = data.slice(); - } - }, - - /** - * @public - * @return {Array=} data Can be null - */ - getData: function () { - return this.get('data'); - }, - - /** - * @override - */ - restoreData: function () { - // FIXME - // clone? - if (this._dataBeforeProcessing) { - this.option.data = this._dataBeforeProcessing.slice(); - } - } + axis: null }); zrUtil.merge(PolarAxisModel.prototype, require('../axisModelCommonMixin')); -- GitLab