Merge branch 'dev-3.0.0' of https://github.com/ecomfe/echarts into dev-3.0.0

src/chart/graph/GraphSeries.js

@@ -101,7 +101,7 @@ define(function (require) {
             zlevel: 0,
             z: 2,
 
-            color: ['#61a0a8', '#d14a61', '#2f4554', '#675bba', '#fec42c',
+            color: ['#61a0a8', '#d14a61', '#fd9c35', '#675bba', '#fec42c',
                     '#dd4444', '#fd9c35', '#cd4870'],
 
             coordinateSystem: 'view',

src/chart/graph/GraphView.js

@@ -113,7 +113,7 @@ define(function (require) {
             (function step() {
                 forceLayout.step(function (stopped) {
                     self.updateLayout();
-                    (this._layouting = !stopped) && (
+                    (self._layouting = !stopped) && (
                         layoutAnimation
                             ? (self._layoutTimeout = setTimeout(step, 16))
                             : step()

src/chart/map.js

@@ -8,6 +8,8 @@ define(function (require) {
 
     require('../action/geoRoam');
 
+    require('../coord/geo/geoCreator');
+
     echarts.registerLayout(require('./map/mapSymbolLayout'));
 
     echarts.registerVisualCoding('chart', require('./map/mapVisual'));

src/coord/geo/geoCreator.js

@@ -164,7 +164,7 @@ define(function (require) {
             }
             if (typeof geoJson === 'string') {
                 geoJson = (typeof JSON !== 'undefined' && JSON.parse)
-                    ? JSON.parse(geoJson) : eval('(' + geoJson + ')');
+                    ? JSON.parse(geoJson) : (new Function('return (' + geoJson + ');'))();
             }
             mapDataStores[mapName] = {
                 geoJson: geoJson,