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

.jshintrc

@@ -26,6 +26,7 @@
     "debug": false,
     "eqnull": true,
     "esversion": 6,
+    "module": true,
     "evil": true,
     "expr": true,
     "funcscope": false,

build/.jshintrc

+{
+    "bitwise": false,
+    "camelcase": true,
+    "curly": true,
+    "eqeqeq": false,
+    "forin": false,
+    "immed": true,
+    "latedef": false,
+    "newcap": true,
+    "noarg": false,
+    "noempty": true,
+    "nonew": true,
+    "plusplus": false,
+    "quotmark": "single",
+    "regexp": false,
+    "undef": true,
+    "unused": "vars",
+    "strict": false,
+    "trailing": false,
+    "maxparams": 20,
+    "maxdepth": 6,
+    "maxlen": 200,
+
+    "asi": false,
+    "boss": false,
+    "debug": false,
+    "eqnull": true,
+    "esversion": 6,
+    "evil": true,
+    "expr": true,
+    "funcscope": false,
+    "globalstrict": false,
+    "iterator": false,
+    "lastsemic": false,
+    "laxbreak": true,
+    "laxcomma": false,
+    "loopfunc": false,
+    "multistr": false,
+    "onecase": false,
+    "proto": false,
+    "regexdash": false,
+    "scripturl": false,
+    "smarttabs": false,
+    "shadow": true,
+    "sub": true,
+    "supernew": false,
+    "validthis": true,
+
+    "browser": true,
+    "couch": false,
+    "devel": true,
+    "dojo": false,
+    "jquery": true,
+    "mootools": false,
+    "node": false,
+    "nonstandard": false,
+    "prototypejs": false,
+    "rhino": false,
+    "wsh": false,
+
+    "nomen": false,
+    "onevar": false,
+    "passfail": false,
+    "white": false,
+
+    "varstmt": true,
+
+    "predef": [
+        "__DEV__",
+        "global",
+        "require",
+        "exports",
+        "Buffer",
+        "__dirname"
+    ]
+}
\ No newline at end of file

build/build.js

 #!/usr/bin/env node
 
-let fsExtra = require('fs-extra');
-let {resolve} = require('path');
-let config = require('./config.js');
-let commander = require('commander');
-let {build, watch} = require('./helper');
+const fsExtra = require('fs-extra');
+const {resolve} = require('path');
+const config = require('./config.js');
+const commander = require('commander');
+const {build, watch} = require('./helper');
 
 function run() {
 
@@ -60,11 +60,11 @@ function run() {
     let configs = [];
 
     if (isWatch) {
-        watch(config.createEChartsBuild(opt));
+        watch(config.createECharts(opt));
     }
     else {
         if (!buildAll) {
-            configs = [config.createEChartsBuild(opt)];
+            configs = [config.createECharts(opt)];
         }
         else {
             configs = [];
@@ -76,15 +76,15 @@ function run() {
                 {min: true, lang: 'en'}
             ].forEach(function (opt) {
                 ['', 'simple', 'common'].forEach(function (type) {
-                    configs.push(config.createEChartsBuild(Object.assign({type}, opt)));
+                    configs.push(config.createECharts(Object.assign({type}, opt)));
                 });
             });
 
             configs.push(
-                config.createBMapBuild(false),
-                config.createBMapBuild(true),
-                config.createDataToolBuild(false),
-                config.createDataToolBuild(true)
+                config.createBMap(false),
+                config.createBMap(true),
+                config.createDataTool(false),
+                config.createDataTool(true)
             );
         }
 
@@ -96,7 +96,10 @@ function run() {
     }
 }
 
-// Based on echarts dir/
+/**
+ * @param {string} relativePath Based on echarts directory.
+ * @return {string} Absolute path.
+ */
 function getPath(relativePath) {
     return resolve(__dirname, '../', relativePath);
 }

build/config.js

-/* global require, __dirname, exports */
-
-let nodeResolvePlugin = require('rollup-plugin-node-resolve');
-let uglifyPlugin = require('rollup-plugin-uglify');
-let {dirname, resolve} = require('path');
+const nodeResolvePlugin = require('rollup-plugin-node-resolve');
+const uglifyPlugin = require('rollup-plugin-uglify');
+const {dirname, resolve} = require('path');
 
 // Based on echarts/
 function getPath(relativePath) {
@@ -49,7 +47,7 @@ function getPlugins(min, lang) {
  * @param {boolean} [opt.min=false]
  * @param {string} [opt.lang=undefined] null/undefined/'' or 'en' or 'fi' or ...
  */
-exports.createEChartsBuild = function (opt) {
+exports.createECharts = function (opt) {
     opt = opt || {};
     let postfixType = opt.type ? '.' + opt.type : '';
     let postfixMin = opt.min ? '.min' : '';
@@ -74,7 +72,7 @@ exports.createEChartsBuild = function (opt) {
 /**
  * @param {boolean} [min=false]
  */
-exports.createBMapBuild = function (min) {
+exports.createBMap = function (min) {
     let postfix = min ? '.min' : '';
 
     return {
@@ -101,7 +99,7 @@ exports.createBMapBuild = function (min) {
 /**
  * @param {boolean} [min=false]
  */
-exports.createDataToolBuild = function (min) {
+exports.createDataTool = function (min) {
     let postfix = min ? '.min' : '';
     return {
         plugins: getPlugins(min),
@@ -123,3 +121,18 @@ exports.createDataToolBuild = function (min) {
         }
     };
 };
+
+/**
+ * @param {string} [absolutePath]
+ */
+exports.createSingleModule = function (absolutePath) {
+    return {
+        plugins: getPlugins(),
+        input: absolutePath,
+        legacy: true, // Support IE8-
+        output: {
+            name: 'echarts',
+            format: 'amd'
+        }
+    };
+};

build/helper.js

-/* global require, exports */
-
-let rollup = require('rollup');
+const rollup = require('rollup');
 
 /**
  * @param {Array.<Object>} configs A list of rollup configs:
@@ -14,45 +12,50 @@ let rollup = require('rollup');
  *      },
  *      ...
  *  ]
+ * @return {Promise}
  */
 exports.build = function (configs) {
-    let index = 0;
+    return new Promise(function (promiseResolve, promiseReject) {
+        let index = 0;
 
-    buildSingle();
+        buildSingle();
 
-    function buildSingle() {
-        let singleConfig = configs[index++];
+        function buildSingle() {
+            let singleConfig = configs[index++];
 
-        if (!singleConfig) {
-            return;
-        }
+            if (!singleConfig) {
+                promiseResolve();
+                return;
+            }
 
-        console.log(
-            color('fgCyan', 'dim')('\nBundles '),
-            color('fgCyan')(singleConfig.input),
-            color('fgCyan', 'dim')('=>'),
-            color('fgCyan')(singleConfig.output.file),
-            color('fgCyan', 'dim')(' ...')
-        );
+            console.log(
+                color('fgCyan', 'dim')('\nBundles '),
+                color('fgCyan')(singleConfig.input),
+                color('fgCyan', 'dim')('=>'),
+                color('fgCyan')(singleConfig.output.file),
+                color('fgCyan', 'dim')(' ...')
+            );
 
-        rollup
-            .rollup(singleConfig)
-            .then(function (bundle) {
-                return bundle.write(singleConfig.output);
-            })
-            .then(function () {
-                console.log(
-                    color('fgGreen', 'dim')('Created '),
-                    color('fgGreen')(singleConfig.output.file),
-                    color('fgGreen', 'dim')(' successfully.')
-                );
-                buildSingle();
-            })
-            .catch(function (err) {
-                console.log(color('fgRed')(err));
-            });
-    }
-}
+            rollup
+                .rollup(singleConfig)
+                .then(function (bundle) {
+                    return bundle.write(singleConfig.output);
+                })
+                .then(function () {
+                    console.log(
+                        color('fgGreen', 'dim')('Created '),
+                        color('fgGreen')(singleConfig.output.file),
+                        color('fgGreen', 'dim')(' successfully.')
+                    );
+                    buildSingle();
+                })
+                .catch(function (err) {
+                    console.log(color('fgRed')(err));
+                    promiseReject();
+                });
+        }
+    });
+};
 
 /**
  * @param {Object} singleConfig A single rollup config:
@@ -65,7 +68,7 @@ exports.build = function (configs) {
  *  }
  */
 exports.watch = function (singleConfig) {
-    var watcher = rollup.watch(singleConfig);
+    let watcher = rollup.watch(singleConfig);
 
     watcher.on('event', function (event) {
         // event.code can be one of:
@@ -89,7 +92,7 @@ exports.watch = function (singleConfig) {
             printWatchResult(event);
         }
     });
-}
+};
 
 function printWatchResult(event) {
     console.log(
@@ -155,12 +158,12 @@ const COLOR_MAP = {
  * Print colored text with `console.log`.
  *
  * Usage:
- * var color = require('colorConsole');
+ * let color = require('colorConsole');
  * color('fgCyan')('some text'); // cyan text.
  * color('fgCyan', 'bright')('some text'); // bright cyan text.
  * color('fgCyan', 'bgRed')('some text') // cyan text and red background.
  */
-function color() {
+let color = exports.color = function () {
     let prefix = [];
     for (let i = 0; i < arguments.length; i++) {
         let color = COLOR_MAP[arguments[i]];
@@ -171,4 +174,4 @@ function color() {
     return function (text) {
         return prefix + text + COLOR_RESET;
     };
-}
+};

test/allZero.html

@@ -2,8 +2,8 @@
     <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/facePrint.js"></script>
     </head>
     <body>

test/area-large.html

@@ -2,8 +2,8 @@
 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/jquery.min.js"></script>
         <script src="lib/facePrint.js"></script>
         <script src="lib/testHelper.js"></script>

test/area.html

@@ -2,7 +2,7 @@
     <head>
         <meta charset="utf-8">
         <script src="http://requirejs.org/docs/release/2.2.0/minified/require.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/config.js"></script>
         <meta name="viewport" content="user-scalable=no,width=device-width,height=device-height">
     </head>
     <body>

test/area2.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <meta name="viewport" content="user-scalable=no,width=device-width,height=device-height">
     </head>
     <body>

test/areaLineUpdate.html

@@ -2,8 +2,8 @@
     <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/facePrint.js"></script>
     </head>
     <body>

test/axes.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <link rel="stylesheet" href="reset.css">
     </head>
     <body>

test/axis-boundaryGap.html

@@ -2,8 +2,8 @@
 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/jquery.min.js"></script>
         <script src="lib/facePrint.js"></script>
         <meta name="viewport" content="width=device-width, initial-scale=1" />

test/axis-lastLabel.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/facePrint.js"></script>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link rel="stylesheet" href="reset.css" />

test/axis.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
     </head>
     <body>

test/axisPosition.html

@@ -2,8 +2,8 @@
 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/jquery.min.js"></script>
         <script src="lib/facePrint.js"></script>
         <script src="lib/testHelper.js"></script>

test/bar-label-rotation.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
     </head>
     <body>

test/bar-large.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
     </head>
     <body>

test/bar-polar-basic-radial.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
     </head>
     <body>

test/bar-polar-basic.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
     </head>
     <body>

test/bar-polar-multi-series-radial.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
     </head>
     <body>

test/bar-polar-multi-series.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
     </head>
     <body>

test/bar-polar-null-data-radial.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
     </head>
     <body>

test/bar-polar-null-data.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
     </head>
     <body>

test/bar-polar-real-estate.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
     </head>
     <body>

test/bar-polar-stack.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
     </head>
     <body>

test/bar.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/jquery.min.js"></script>
         <script src="lib/facePrint.js"></script>
         <script src="lib/testHelper.js"></script>

test/bar2.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/jquery.min.js"></script>
         <script src="lib/facePrint.js"></script>
         <script src="lib/testHelper.js"></script>

test/bar3.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
     </head>
     <body>

test/bmap.html

 <html>
     <head>
         <meta charset='utf-8'>
-        <script src='esl.js'></script>
-        <script src='config.js'></script>
+        <script src='lib/esl.js'></script>
+        <script src='lib/config.js'></script>
         <script src='lib/jquery.min.js'></script>
         <script src="http://api.map.baidu.com/api?v=2.0&ak=ZUONbpqGBsYGXNIYHicvbAbM"></script>
         <meta name="viewport" content="width=device-width, initial-scale=1" />

test/boxplot-multi.html

@@ -2,8 +2,8 @@
     <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/facePrint.js"></script>
         <script src="lib/dat.gui.min.js"></script>
     </head>

test/boxplot.html

@@ -3,8 +3,8 @@
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link rel="stylesheet" href="reset.css"/>
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/facePrint.js"></script>
     </head>
     <body>

test/brush.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <link rel="stylesheet" href="reset.css" />
     </head>
     <body>

test/brush2.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/jquery.min.js"></script>
         <link rel="stylesheet" href="reset.css" />
     </head>

test/calendar-converter.html

@@ -4,8 +4,8 @@
         <title>calendar</title>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link rel="stylesheet" href="reset.css">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/jquery.min.js"></script>
     </head>
     <body>

test/calendar-effectScater.html

@@ -4,8 +4,8 @@
         <title>calendar</title>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link rel="stylesheet" href="reset.css">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/jquery.min.js"></script>
     </head>
     <body>

test/calendar-graph.html

@@ -4,8 +4,8 @@
         <title>calendar</title>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link rel="stylesheet" href="reset.css">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/jquery.min.js"></script>
     </head>
     <body>

test/calendar-heatmap.html

@@ -4,8 +4,8 @@
         <title>calendar</title>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link rel="stylesheet" href="reset.css">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/jquery.min.js"></script>
     </head>
     <body>

test/calendar-month.html

@@ -4,8 +4,8 @@
         <title>calendar</title>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link rel="stylesheet" href="reset.css">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/jquery.min.js"></script>
     </head>
     <body>

test/calendar-more.html

@@ -4,8 +4,8 @@
         <title>calendar</title>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link rel="stylesheet" href="reset.css">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/jquery.min.js"></script>
     </head>
     <body>

test/calendar-orient.html

@@ -4,8 +4,8 @@
         <title>calendar</title>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link rel="stylesheet" href="reset.css">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/jquery.min.js"></script>
     </head>
     <body>

test/calendar-range.html

@@ -4,8 +4,8 @@
         <title>calendar</title>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link rel="stylesheet" href="reset.css">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/jquery.min.js"></script>
     </head>
     <body>

test/calendar-scatter.html

@@ -4,8 +4,8 @@
         <title>calendar</title>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link rel="stylesheet" href="reset.css">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/jquery.min.js"></script>
     </head>
     <body>

test/calendar-simple.html

@@ -4,8 +4,8 @@
         <title>calendar</title>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link rel="stylesheet" href="reset.css">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/jquery.min.js"></script>
     </head>
     <body>

test/calendar-size.html

@@ -4,8 +4,8 @@
         <title>calendar</title>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link rel="stylesheet" href="reset.css">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/jquery.min.js"></script>
     </head>
     <body>

test/calendar-split.html

@@ -4,8 +4,8 @@
         <title>calendar</title>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link rel="stylesheet" href="reset.css">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/jquery.min.js"></script>
     </head>
     <body>

test/calendar-type.html

@@ -4,8 +4,8 @@
         <title>calendar</title>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link rel="stylesheet" href="reset.css">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/jquery.min.js"></script>
     </head>
     <body>

test/calendar-vertical.html

@@ -4,8 +4,8 @@
         <title>calendar</title>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link rel="stylesheet" href="reset.css">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/jquery.min.js"></script>
     </head>
     <body>

test/calendar-week.html

@@ -4,8 +4,8 @@
         <title>calendar</title>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link rel="stylesheet" href="reset.css">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/jquery.min.js"></script>
     </head>
     <body>

test/calendar-year.html

@@ -4,8 +4,8 @@
         <title>calendar</title>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link rel="stylesheet" href="reset.css">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/jquery.min.js"></script>
     </head>
     <body>

test/calendar.html

@@ -4,8 +4,8 @@
         <title>calendar</title>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link rel="stylesheet" href="reset.css">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/jquery.min.js"></script>
     </head>
     <body>

test/candlestick-doji.html

@@ -2,8 +2,8 @@
     <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/facePrint.js"></script>
     </head>
     <body>

test/candlestick-empty.html

@@ -2,8 +2,8 @@
     <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/facePrint.js"></script>
     </head>
     <body>

test/candlestick.html

@@ -2,8 +2,8 @@
     <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/facePrint.js"></script>
     </head>
     <body>

test/candlestickConnect.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="./esl.js"></script>
-        <script src="./config.js"></script>
+        <script src="./lib/esl.js"></script>
+        <script src="./lib/config.js"></script>
     </head>
     <body>
         <style>

test/canvas-replay.html

@@ -2,8 +2,8 @@
 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/jquery.min.js"></script>
         <script src="lib/facePrint.js"></script>
 		<script src="ut/lib/canteen.js"></script>

test/chord.html

@@ -2,8 +2,8 @@
     <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/facePrint.js"></script>
     </head>
     <body>

test/color-mix-aqi.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="./esl.js"></script>
-        <script src="./config.js"></script>
+        <script src="./lib/esl.js"></script>
+        <script src="./lib/config.js"></script>
         <link rel="stylesheet" href="./reset.css">
     </head>
     <body>

test/config.js

-require.config({
-    paths: {
-        'geoJson': '../geoData/geoJson',
-        'theme': '../theme',
-        'data': './data',
-        'map': '../map',
-        'extension': '../dist/extension'
-    },
-    packages: [
-        {
-            main: 'echarts',
-            location: '../dist',
-            name: 'echarts'
-        },
-        {
-            main: 'zrender',
-            location: '../../zrender/dist',
-            name: 'zrender'
-        }
-    ]
-    // urlArgs: '_v_=' + +new Date()
-});
\ No newline at end of file

test/connect-dynamic.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <link rel="stylesheet" href="reset.css" />
     </head>
     <body>

test/connect-manually.html

@@ -3,8 +3,8 @@
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link rel="stylesheet" href="reset.css"/>
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
     </head>
     <body>
         <style>

test/connect.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
     </head>
     <body>
         <style>

test/connect2.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="./esl.js"></script>
-        <script src="./config.js"></script>
+        <script src="./lib/esl.js"></script>
+        <script src="./lib/config.js"></script>
         <link rel="stylesheet" href="./reset.css">
     </head>
     <body>

test/css-transform.html

@@ -2,8 +2,8 @@
 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/jquery.min.js"></script>
         <script src="lib/facePrint.js"></script>
         <meta name="viewport" content="width=device-width, initial-scale=1" />

test/custom-bmap-grid.html

@@ -2,8 +2,8 @@
     <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/testHelper.js"></script>
         <script src="lib/jquery.min.js"></script>
         <script src="http://api.map.baidu.com/api?v=2.0&ak=ZUONbpqGBsYGXNIYHicvbAbM"></script>

test/custom-bmap-polygon.html

 <html>
     <head>
         <meta charset='utf-8'>
-        <script src='esl.js'></script>
-        <script src='config.js'></script>
+        <script src='lib/esl.js'></script>
+        <script src='lib/config.js'></script>
         <script src='lib/jquery.min.js'></script>
         <script src="http://api.map.baidu.com/api?v=2.0&ak=ZUONbpqGBsYGXNIYHicvbAbM"></script>
         <meta name="viewport" content="width=device-width, initial-scale=1" />

test/custom-children-remove.html

@@ -2,8 +2,8 @@
 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/jquery.min.js"></script>
         <script src="lib/facePrint.js"></script>
         <script src="lib/testHelper.js"></script>

test/custom-hexbin.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/jquery.min.js"></script>
         <script src="lib/testHelper.js"></script>
         <meta name="viewport" content="width=device-width, initial-scale=1" />

test/custom.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/testHelper.js"></script>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link rel="stylesheet" href="reset.css" />

test/dataView.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src=""></script>
         <script src="//cdn.datatables.net/1.10.11/js/jquery.dataTables.min.js"></script>
         <link rel="stylesheet" href="//cdn.datatables.net/1.10.11/css/jquery.dataTables.min.css">

test/dataZoom-axes.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
     </head>
     <body>
         <style>

test/dataZoom-axis-type.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
     </head>
     <body>
         <style>

test/dataZoom-cartesian-h.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
     </head>
     <body>
         <style>

test/dataZoom-cartesian-v.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
     </head>
     <body>
         <style>

test/dataZoom-dataShadow.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
     </head>
     <body>
         <style>

test/dataZoom-dataShadow0.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
     </head>
     <body>
         <style>

test/dataZoom-dataShadow1.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
     </head>
     <body>
         <style>

test/dataZoom-dataShadow2.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
     </head>
     <body>
         <style>

test/dataZoom-dynamic.html

@@ -2,8 +2,8 @@
 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/testHelper.js"></script>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link rel="stylesheet" href="reset.css">

test/dataZoom-geo.html

@@ -2,8 +2,8 @@
 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link rel="stylesheet" href="reset.css">
     </head>

test/dataZoom-rainfall-connect.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="./esl.js"></script>
-        <script src="./config.js"></script>
+        <script src="./lib/esl.js"></script>
+        <script src="./lib/config.js"></script>
     </head>
     <body>
         <style>

test/dataZoom-rainfall-inside.html

@@ -2,8 +2,8 @@
     <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <script src="./esl.js"></script>
-        <script src="./config.js"></script>
+        <script src="./lib/esl.js"></script>
+        <script src="./lib/config.js"></script>
         <script src="./lib/facePrint.js"></script>
         <script src="lib/testHelper.js"></script>
         <link rel="stylesheet" href="reset.css" />

test/dataZoom-rainfall.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="./esl.js"></script>
-        <script src="./config.js"></script>
+        <script src="./lib/esl.js"></script>
+        <script src="./lib/config.js"></script>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
     </head>
     <body>

test/dataZoom-scatter-category.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
     </head>
     <body>

test/dataZoom-scatter-hv-polar.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/jquery.min.js"></script>
     </head>
     <body>

test/dataZoom-scatter-hv.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
     </head>
     <body>
         <style>

test/dataZoom-sync.html

@@ -2,8 +2,8 @@
 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/jquery.min.js"></script>
         <script src="lib/facePrint.js"></script>
         <meta name="viewport" content="width=device-width, initial-scale=1" />

test/dataZoom-toolbox.html

@@ -2,8 +2,8 @@
 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/jquery.min.js"></script>
         <script src="lib/facePrint.js"></script>
         <meta name="viewport" content="width=device-width, initial-scale=1" />

test/dataZoomHighPrecision.html

@@ -2,8 +2,8 @@
     <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <link ref="stylesheet" href="reset.css" />
     </head>
     <body>

test/diff.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <meta name="viewport" content="user-scalable=no,width=device-width,height=device-height">
     </head>
     <body>

test/dynamicData.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
     </head>
     <body>

test/dynamicData2.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/facePrint.js"></script>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
     </head>

test/dynamicData3.html

@@ -2,8 +2,8 @@
 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/jquery.min.js"></script>
         <script src="lib/facePrint.js"></script>
         <meta name="viewport" content="width=device-width, initial-scale=1" />

test/effectScatter.html

 <html>
     <head>
         <meta charset='utf-8'>
-        <script src='esl.js'></script>
-        <script src='config.js'></script>
+        <script src='lib/esl.js'></script>
+        <script src='lib/config.js'></script>
         <script src='lib/jquery.min.js'></script>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
     </head>

test/encode.html

 <html>
     <head>
         <meta charset="utf-8">
-        <script src="esl.js"></script>
-        <script src="config.js"></script>
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
         <script src="lib/testHelper.js"></script>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link rel="stylesheet" href="reset.css" />