From f1626be46bf5d6e6dbebcc28c7179fc9d458d22f Mon Sep 17 00:00:00 2001 From: lang Date: Tue, 3 Nov 2015 19:19:08 +0800 Subject: [PATCH] Comma --- src/component/axis/AxisView.js | 2 +- src/component/marker/markerHelper.js | 2 +- src/coord/Axis.js | 4 ++-- src/data/List.js | 1 + src/scale/Interval.js | 10 +++++----- src/scale/Ordinal.js | 2 +- src/scale/Time.js | 12 ++++++------ 7 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/component/axis/AxisView.js b/src/component/axis/AxisView.js index 76001d2cc..532bed93e 100644 --- a/src/component/axis/AxisView.js +++ b/src/component/axis/AxisView.js @@ -15,7 +15,7 @@ define(function (require) { labelInterval = this._labelInterval = axisLabelInterval(this); } return labelInterval; - } + }; /** * @inner diff --git a/src/component/marker/markerHelper.js b/src/component/marker/markerHelper.js index f42cd4828..29a325e29 100644 --- a/src/component/marker/markerHelper.js +++ b/src/component/marker/markerHelper.js @@ -98,7 +98,7 @@ define(function (require) { var value = item.value; value = [value[coordDataIdx[0]], value[coordDataIdx[1]]]; return coordSys.containData(value); - } + }; return { dataTransform: dataTransform, diff --git a/src/coord/Axis.js b/src/coord/Axis.js index 2cdddd421..27afa54f4 100644 --- a/src/coord/Axis.js +++ b/src/coord/Axis.js @@ -1,6 +1,6 @@ define(function (require) { - var numberUtil = require('../util/number') + var numberUtil = require('../util/number'); var linearMap = numberUtil.linearMap; var zrUtil = require('zrender/core/util'); @@ -69,7 +69,7 @@ define(function (require) { * @return {boolean} */ containData: function (data) { - return this.contain(this.dataToCoord(data)) + return this.contain(this.dataToCoord(data)); }, /** diff --git a/src/data/List.js b/src/data/List.js index 844393a67..3bebde5f2 100644 --- a/src/data/List.js +++ b/src/data/List.js @@ -180,6 +180,7 @@ define(function (require) { * @param {string} [valueProp='value'] */ listProto.initData = function (data, nameList, valueProp) { + data = data || []; valueProp = valueProp || 'value'; diff --git a/src/scale/Interval.js b/src/scale/Interval.js index 8e8ca74a1..8ab14de91 100644 --- a/src/scale/Interval.js +++ b/src/scale/Interval.js @@ -182,16 +182,16 @@ define(function (require) { var err = approxTickNum / span * interval; // Filter ticks to get closer to the desired count. - if (err <= .15) { + if (err <= 0.15) { interval *= 10; } - else if (err <= .3) { + else if (err <= 0.3) { interval *= 5; } - else if (err <= .5) { + else if (err <= 0.5) { interval *= 3; } - else if (err <= .75) { + else if (err <= 0.75) { interval *= 2; } @@ -230,7 +230,7 @@ define(function (require) { */ IntervalScale.create = function () { return new IntervalScale(); - } + }; require('./scale').register(IntervalScale); diff --git a/src/scale/Ordinal.js b/src/scale/Ordinal.js index 5c4bfed8a..1f5f4f774 100644 --- a/src/scale/Ordinal.js +++ b/src/scale/Ordinal.js @@ -151,7 +151,7 @@ define(function (require) { // Do nothing niceTicks: function () {}, - niceExtent: function () {}, + niceExtent: function () {} }; require('./scale').register(OrdinalScale); diff --git a/src/scale/Time.js b/src/scale/Time.js index 7cbd57850..78cb45c1a 100644 --- a/src/scale/Time.js +++ b/src/scale/Time.js @@ -26,7 +26,7 @@ define(function (require) { } } return lo; - } + }; /** * @param {string|Date|number} value @@ -36,7 +36,7 @@ define(function (require) { return value instanceof Date ? value : new Date(typeof value == 'string' ? value.replace(/-/g, '/') : value); - } + }; /** * @param {string} str @@ -45,7 +45,7 @@ define(function (require) { */ var s2d = function (str) { return str < 10 ? ('0' + str) : str; - } + }; /** * ISO Date format @@ -85,7 +85,7 @@ define(function (require) { .replace('s', s); return tpl; - } + }; /** * @alias module:echarts/coord/scale/Time * @constructor @@ -93,7 +93,7 @@ define(function (require) { var TimeScale = function () { IntervalScale.call(this); - } + }; TimeScale.prototype = { @@ -115,7 +115,7 @@ define(function (require) { approxTickNum = approxTickNum || 10; var extent = this._extent; - var span = extent[1]-extent[0]; + var span = extent[1] - extent[0]; var approxInterval = span / approxTickNum; var scaleLevelsLen = scaleLevels.length; var idx = bisect(scaleLevels, approxInterval, 0, scaleLevelsLen); -- GitLab