Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/ecomfe/echarts
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/echarts.js
  • Loading branch information
100pah committed Mar 15, 2017
2 parents 723cf29 + c135fdb commit d7ba7f7
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
2 changes: 2 additions & 0 deletions src/coord/geo/Region.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ define(function (require) {

constructor: Region,

properties: null,

/**
* @return {module:zrender/core/BoundingRect}
*/
Expand Down
4 changes: 3 additions & 1 deletion src/coord/geo/parseGeoJson.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,13 @@ define(function (require) {
});
}

return new Region(
var region = new Region(
properties.name,
geometries,
properties.cp
);
region.properties = properties;
return region;
});
};
});
6 changes: 6 additions & 0 deletions src/echarts.js
Original file line number Diff line number Diff line change
Expand Up @@ -1621,12 +1621,18 @@ define(function (require) {
};

/**
* @DEPRECATED
* @return {string} groupId
*/
echarts.disConnect = function (groupId) {
connectedGroups[groupId] = false;
};

/**
* @return {string} groupId
*/
echarts.disconnect = echarts.disConnect;

/**
* Dispose a chart instance
* @param {module:echarts~ECharts|HTMLDomElement|string} chart
Expand Down

0 comments on commit d7ba7f7

Please sign in to comment.