Merge branch 'master' of github.com:ecomfe/echarts

build/build.sh

@@ -9,6 +9,8 @@ npm run prepublish
 
 ./node_modules/.bin/webpack
 ./node_modules/.bin/webpack -p
+./node_modules/.bin/webpack --lang-en
+./node_modules/.bin/webpack -p --lang-en
 ./node_modules/.bin/webpack --config extension/webpack.config.js
 ./node_modules/.bin/webpack --config extension/webpack.config.js -p
 

index-en.common.js

-/**
- * Export echarts as CommonJS module
- */
-module.exports = require('./lib/echarts');
-
-require('./lib/lang/en');
-
-require('./index/part.common');

index-en.js

-/**
- * Export echarts as CommonJS module
- */
-module.exports = require('./lib/echarts');
-
-require('./lib/lang/en');
-
-require('./index/part');
\ No newline at end of file

index-en.simple.js

-/**
- * Export echarts as CommonJS module
- */
-module.exports = require('./lib/echarts');
-
-require('./lib/lang/en');
-
-require('./index/part.simple');
\ No newline at end of file

index.common.js

@@ -3,4 +3,22 @@
  */
 module.exports = require('./lib/echarts');
 
-require('./index/part.common');
\ No newline at end of file
+require('./lib/chart/line');
+require('./lib/chart/bar');
+require('./lib/chart/pie');
+require('./lib/chart/scatter');
+require('./lib/component/graphic');
+require('./lib/component/tooltip');
+require('./lib/component/axisPointer');
+require('./lib/component/legendScroll');
+
+require('./lib/component/grid');
+require('./lib/component/title');
+
+require('./lib/component/markPoint');
+require('./lib/component/markLine');
+require('./lib/component/markArea');
+require('./lib/component/dataZoom');
+require('./lib/component/toolbox');
+
+require('zrender/lib/vml/vml');
\ No newline at end of file

index.js

@@ -3,4 +3,51 @@
  */
 module.exports = require('./lib/echarts');
 
-require('./index/part');
\ No newline at end of file
+// Import all charts and components
+require('./lib/chart/line');
+require('./lib/chart/bar');
+require('./lib/chart/pie');
+require('./lib/chart/scatter');
+require('./lib/chart/radar');
+
+require('./lib/chart/map');
+require('./lib/chart/treemap');
+require('./lib/chart/graph');
+require('./lib/chart/gauge');
+require('./lib/chart/funnel');
+require('./lib/chart/parallel');
+require('./lib/chart/sankey');
+require('./lib/chart/boxplot');
+require('./lib/chart/candlestick');
+require('./lib/chart/effectScatter');
+require('./lib/chart/lines');
+require('./lib/chart/heatmap');
+require('./lib/chart/pictorialBar');
+require('./lib/chart/themeRiver');
+require('./lib/chart/custom');
+
+require('./lib/component/graphic');
+require('./lib/component/grid');
+require('./lib/component/legendScroll');
+require('./lib/component/tooltip');
+require('./lib/component/axisPointer');
+require('./lib/component/polar');
+require('./lib/component/geo');
+require('./lib/component/parallel');
+require('./lib/component/singleAxis');
+require('./lib/component/brush');
+require('./lib/component/calendar');
+
+require('./lib/component/title');
+
+require('./lib/component/dataZoom');
+require('./lib/component/visualMap');
+
+require('./lib/component/markPoint');
+require('./lib/component/markLine');
+require('./lib/component/markArea');
+
+require('./lib/component/timeline');
+require('./lib/component/toolbox');
+
+require('zrender/lib/vml/vml');

index.simple.js

@@ -3,4 +3,7 @@
  */
 module.exports = require('./lib/echarts');
 
-require('./index/part.simple');
\ No newline at end of file
+require('./lib/chart/line');
+require('./lib/chart/bar');
+require('./lib/chart/pie');
+require('./lib/component/gridSimple');
\ No newline at end of file

index/part.common.js

-require('../lib/chart/line');
-require('../lib/chart/bar');
-require('../lib/chart/pie');
-require('../lib/chart/scatter');
-require('../lib/component/graphic');
-require('../lib/component/tooltip');
-require('../lib/component/axisPointer');
-require('../lib/component/legendScroll');
-
-require('../lib/component/grid');
-require('../lib/component/title');
-
-require('../lib/component/markPoint');
-require('../lib/component/markLine');
-require('../lib/component/markArea');
-require('../lib/component/dataZoom');
-require('../lib/component/toolbox');
-
-require('zrender/lib/vml/vml');
\ No newline at end of file

index/part.js

-// Import all charts and components
-require('../lib/chart/line');
-require('../lib/chart/bar');
-require('../lib/chart/pie');
-require('../lib/chart/scatter');
-require('../lib/chart/radar');
-
-require('../lib/chart/map');
-require('../lib/chart/treemap');
-require('../lib/chart/graph');
-require('../lib/chart/gauge');
-require('../lib/chart/funnel');
-require('../lib/chart/parallel');
-require('../lib/chart/sankey');
-require('../lib/chart/boxplot');
-require('../lib/chart/candlestick');
-require('../lib/chart/effectScatter');
-require('../lib/chart/lines');
-require('../lib/chart/heatmap');
-require('../lib/chart/pictorialBar');
-require('../lib/chart/themeRiver');
-require('../lib/chart/custom');
-
-require('../lib/component/graphic');
-require('../lib/component/grid');
-require('../lib/component/legendScroll');
-require('../lib/component/tooltip');
-require('../lib/component/axisPointer');
-require('../lib/component/polar');
-require('../lib/component/geo');
-require('../lib/component/parallel');
-require('../lib/component/singleAxis');
-require('../lib/component/brush');
-require('../lib/component/calendar');
-
-require('../lib/component/title');
-
-require('../lib/component/dataZoom');
-require('../lib/component/visualMap');
-
-require('../lib/component/markPoint');
-require('../lib/component/markLine');
-require('../lib/component/markArea');
-
-require('../lib/component/timeline');
-require('../lib/component/toolbox');
-
-require('zrender/lib/vml/vml');

index/part.simple.js

-require('../lib/chart/line');
-require('../lib/chart/bar');
-require('../lib/chart/pie');
-require('../lib/component/gridSimple');
\ No newline at end of file

src/component/axis/AxisBuilder.js

@@ -49,7 +49,7 @@ define(function (require) {
      * @param {Object} opt Standard axis parameters.
      * @param {Array.<number>} opt.position [x, y]
      * @param {number} opt.rotation by radian
-     * @param {number} [opt.nameDirection=1] 1 or -1 Used when nameLocation is 'middle'.
+     * @param {number} [opt.nameDirection=1] 1 or -1 Used when nameLocation is 'middle' or 'center'.
      * @param {number} [opt.tickDirection=1] 1 or -1
      * @param {number} [opt.labelDirection=1] 1 or -1
      * @param {number} [opt.labelOffset=0] Usefull when onZero.
@@ -380,7 +380,7 @@ define(function (require) {
                     ? extent[1] + gapSignal * gap
                     : (extent[0] + extent[1]) / 2, // 'middle'
                 // Reuse labelOffset.
-                nameLocation === 'middle' ? opt.labelOffset + nameDirection * gap : 0
+                isNameLocationCenter(nameLocation) ? opt.labelOffset + nameDirection * gap : 0
             ];
 
             var labelLayout;
@@ -392,7 +392,7 @@ define(function (require) {
 
             var axisNameAvailableWidth;
 
-            if (nameLocation === 'middle') {
+            if (isNameLocationCenter(nameLocation)) {
                 labelLayout = innerTextLayout(
                     opt.rotation,
                     nameRotation != null ? nameRotation : opt.rotation, // Adapt to axis.
@@ -640,6 +640,9 @@ define(function (require) {
         return firstRect.intersect(nextRect);
     }
 
+    function isNameLocationCenter(nameLocation) {
+        return nameLocation === 'middle' || nameLocation === 'center';
+    }
 
     /**
      * @static

src/component/marker/MarkAreaView.js

@@ -221,7 +221,7 @@ define(function (require) {
                     )
                 );
 
-                polygon.hoverStyle = itemModel.getModel('itemStyle.normal').getItemStyle();
+                polygon.hoverStyle = itemModel.getModel('itemStyle.emphasis').getItemStyle();
 
                 graphic.setLabelStyle(
                     polygon.style, polygon.hoverStyle, labelModel, labelHoverModel,

src/echarts.js

@@ -43,7 +43,6 @@ define(function (require) {
     var graphic = require('./util/graphic');
     var modelUtil = require('./util/model');
     var throttle = require('./util/throttle');
-    var langDefault = require('./lang/default');
 
     var zrender = require('zrender/zrender');
     var zrUtil = require('zrender/core/util');
@@ -77,7 +76,6 @@ define(function (require) {
     var OPTION_UPDATED = '__optionUpdated';
     var ACTION_REG = /^[a-zA-Z0-9_]+$/;
 
-    var langSet = zrUtil.clone(langDefault);
 
     function createRegisterEventWithLowercaseName(method) {
         return function (eventName, handler, context) {
@@ -1946,21 +1944,6 @@ define(function (require) {
         zrUtil.createCanvas = creator;
     };
 
-    /**
-     * @param {Object} langObj
-     */
-    echarts.setLang = function (langObj) {
-        langSet = langSet || {};
-        zrUtil.merge(langSet, langObj, true);
-    };
-
-    /**
-     * @return {Ojbect} Lang set.
-     */
-    echarts.getLang = function () {
-        return langSet;
-    };
-
     echarts.registerVisual(PRIORITY_VISUAL_GLOBAL, require('./visual/seriesColor'));
     echarts.registerPreprocessor(backwardCompat);
     echarts.registerLoading('default', require('./loading/default'));

src/lang/cn.js

-define(function(require) {
-
-    require('../echarts').setLang(require('./default'));
-
-});
\ No newline at end of file

src/lang/default.js

-define(function(require) {
-
-    return {
-        toolbox: {
-            brush: {
-                title: {
-                    rect: '矩形选择',
-                    polygon: '圈选',
-                    lineX: '横向选择',
-                    lineY: '纵向选择',
-                    keep: '保持选择',
-                    clear: '清除选择'
-                }
-            },
-            dataView: {
-                title: '数据视图',
-                lang: ['数据视图', '关闭', '刷新']
-            },
-            dataZoom: {
-                title: {
-                    zoom: '区域缩放',
-                    back: '区域缩放还原'
-                }
-            },
-            magicType: {
-                title: {
-                    line: '切换为折线图',
-                    bar: '切换为柱状图',
-                    stack: '切换为堆叠',
-                    tiled: '切换为平铺'
-                }
-            },
-            restore: {
-                title: '还原'
-            },
-            saveAsImage: {
-                title: '保存为图片',
-                lang: ['右键另存为图片']
-            }
-        }
-    };
-
-});
\ No newline at end of file

src/lang/en.js

-define(function(require) {
-
-    require('../echarts').setLang({
-        toolbox: {
-            brush: {
-                title: {
-                    rect: 'Box Select',
-                    polygon: 'Lasso Select',
-                    lineX: 'Horizontally Select',
-                    lineY: 'Vertically Select',
-                    keep: 'Keep Selections',
-                    clear: 'Clear Selections'
-                }
-            },
-            dataView: {
-                title: 'Data View',
-                lang: ['Data View', 'Close', 'Refresh']
-            },
-            dataZoom: {
-                title: {
-                    zoom: 'Zoom',
-                    back: 'Zoom Reset'
-                }
-            },
-            magicType: {
-                title: {
-                    line: 'Switch to Line Chart',
-                    bar: 'Switch to Bar Chart',
-                    stack: 'Stack',
-                    tiled: 'Tile'
-                }
-            },
-            restore: {
-                title: 'Restore'
-            },
-            saveAsImage: {
-                title: 'Save as Image',
-                lang: ['Right Click to Save Image']
-            }
-        }
-    });
-
-});
\ No newline at end of file

test/markArea.html

@@ -57,6 +57,14 @@
                         data: data1,
 
                         markArea: {
+                            itemStyle: {
+                                // normal: {
+                                //     color: 'red'
+                                // },
+                                emphasis: {
+                                    color: 'yellow'
+                                }
+                            },
                             label: {
                                 normal: {
                                     // position: 'right'

webpack.config.js

 var PROD = process.argv.indexOf('-p') >= 0;
 var webpack = require('webpack');
 
+var IS_EN = process.argv.indexOf('--lang-en') >= 0;
+
+var plugins = [
+    new webpack.DefinePlugin({
+        'typeof __DEV__': JSON.stringify('boolean'),
+        __DEV__: PROD ? false : true
+    })
+];
+var outputSuffix = '';
+
+if (IS_EN) {
+    plugins.unshift(
+        new webpack.NormalModuleReplacementPlugin(/\/lang[.]js/, './langEN.js')
+    );
+    outputSuffix = '-en';
+}
+
 module.exports = {
-    plugins: [
-        new webpack.DefinePlugin({
-            'typeof __DEV__': JSON.stringify('boolean'),
-            __DEV__: PROD ? false : true
-        })
-    ],
+    plugins: plugins,
     entry: {
         'echarts': __dirname + '/index.js',
         'echarts.simple': __dirname + '/index.simple.js',
@@ -17,6 +29,8 @@ module.exports = {
         libraryTarget: 'umd',
         library: 'echarts',
         path: __dirname + '/dist',
-        filename: PROD ? '[name].min.js' : '[name].js'
+        filename: PROD
+            ? '[name]' + outputSuffix + '.min.js'
+            : '[name]' + outputSuffix + '.js'
     }
 };
\ No newline at end of file