Skip to content

Commit

Permalink
release 3.8.5
Browse files Browse the repository at this point in the history
  • Loading branch information
@100pah
100pah committed Nov 14, 2017
1 parent adad150 commit eb95d20
Show file tree
Hide file tree
Showing 17 changed files with 218 additions and 115 deletions.
1 change: 0 additions & 1 deletion .npmignore
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/build
/test
/map/tool
/map/raw
Expand Down
74 changes: 50 additions & 24 deletions dist/echarts-en.common.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10456,7 +10456,7 @@ var instances$1 = {}; // ZRender实例map索引
/**
* @type {string}
*/
var version$1 = '3.7.3';
var version$1 = '3.7.4';

/**
* Initializing a zrender instance
Expand Down Expand Up @@ -20880,10 +20880,10 @@ var loadingDefault = function (api, opts) {
var each = each$1;
var parseClassType = ComponentModel.parseClassType;

var version = '3.8.4';
var version = '3.8.5';

var dependencies = {
zrender: '3.7.3'
zrender: '3.7.4'
};

var PRIORITY_PROCESSOR_FILTER = 1000;
Expand Down Expand Up @@ -48477,32 +48477,37 @@ function getSvgElement(displayable) {

/**
* @alias module:zrender/svg/Painter
* @constructor
* @param {HTMLElement} root 绘图容器
* @param {module:zrender/Storage} storage
* @param {Object} opts
*/
var SVGPainter = function (root, storage) {
var SVGPainter = function (root, storage, opts) {

this.root = root;

this.storage = storage;
this._opts = opts = extend({}, opts || {});

var svgRoot = createElement('svg');
svgRoot.setAttribute('xmlns', 'http://www.w3.org/2000/svg');
svgRoot.setAttribute('version', '1.1');
svgRoot.setAttribute('baseProfile', 'full');
svgRoot.style['user-select'] = 'none';
svgRoot.style.cssText = 'position:absolute;left:0;top:0;';

this.gradientManager = new GradientManager(svgRoot);
this.clipPathManager = new ClippathManager(svgRoot);

var viewport = document.createElement('div');
viewport.style.cssText = 'overflow: hidden;';
viewport.style.cssText = 'overflow:hidden;position:relative';

this._svgRoot = svgRoot;
this._viewport = viewport;

root.appendChild(viewport);
viewport.appendChild(svgRoot);

this.resize();
this.resize(opts.width, opts.height);

this._visibleList = [];
};
Expand Down Expand Up @@ -48678,15 +48683,26 @@ SVGPainter.prototype = {
}
},

resize: function () {
var width = this._getWidth();
var height = this._getHeight();
resize: function (width, height) {
var viewport = this._viewport;
// FIXME Why ?
viewport.style.display = 'none';

// Save input w/h
var opts = this._opts;
width != null && (opts.width = width);
height != null && (opts.height = height);

width = this._getSize(0);
height = this._getSize(1);

viewport.style.display = '';

if (this._width !== width && this._height !== height) {
this._width = width;
this._height = height;

var viewportStyle = this._viewport.style;
var viewportStyle = viewport.style;
viewportStyle.width = width + 'px';
viewportStyle.height = height + 'px';

Expand All @@ -48697,30 +48713,40 @@ SVGPainter.prototype = {
}
},

/**
* 获取绘图区域宽度
*/
getWidth: function () {
return this._getWidth();
return this._width;
},

/**
* 获取绘图区域高度
*/
getHeight: function () {
return this._getHeight();
return this._height;
},

_getWidth: function () {
var root = this.root;
var stl = document.defaultView.getComputedStyle(root);
_getSize: function (whIdx) {
var opts = this._opts;
var wh = ['width', 'height'][whIdx];
var cwh = ['clientWidth', 'clientHeight'][whIdx];
var plt = ['paddingLeft', 'paddingTop'][whIdx];
var prb = ['paddingRight', 'paddingBottom'][whIdx];

return ((root.clientWidth || parseInt10$2(stl.width))
- parseInt10$2(stl.paddingLeft)
- parseInt10$2(stl.paddingRight)) | 0;
},
if (opts[wh] != null && opts[wh] !== 'auto') {
return parseFloat(opts[wh]);
}

_getHeight: function () {
var root = this.root;
// IE8 does not support getComputedStyle, but it use VML.
var stl = document.defaultView.getComputedStyle(root);

return ((root.clientHeight || parseInt10$2(stl.height))
- parseInt10$2(stl.paddingTop)
- parseInt10$2(stl.paddingBottom)) | 0;
return (
(root[cwh] || parseInt10$2(stl[wh]) || parseInt10$2(root.style[wh]))
- (parseInt10$2(stl[plt]) || 0)
- (parseInt10$2(stl[prb]) || 0)
) | 0;
},

dispose: function () {
Expand Down
2 changes: 1 addition & 1 deletion dist/echarts-en.common.min.js
View file

Large diffs are not rendered by default.

74 changes: 50 additions & 24 deletions dist/echarts-en.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10456,7 +10456,7 @@ var instances$1 = {}; // ZRender实例map索引
/**
* @type {string}
*/
var version$1 = '3.7.3';
var version$1 = '3.7.4';

/**
* Initializing a zrender instance
Expand Down Expand Up @@ -20946,10 +20946,10 @@ var loadingDefault = function (api, opts) {
var each = each$1;
var parseClassType = ComponentModel.parseClassType;

var version = '3.8.4';
var version = '3.8.5';

var dependencies = {
zrender: '3.7.3'
zrender: '3.7.4'
};

var PRIORITY_PROCESSOR_FILTER = 1000;
Expand Down Expand Up @@ -74435,32 +74435,37 @@ function getSvgElement(displayable) {

/**
* @alias module:zrender/svg/Painter
* @constructor
* @param {HTMLElement} root 绘图容器
* @param {module:zrender/Storage} storage
* @param {Object} opts
*/
var SVGPainter = function (root, storage) {
var SVGPainter = function (root, storage, opts) {

this.root = root;

this.storage = storage;
this._opts = opts = extend({}, opts || {});

var svgRoot = createElement('svg');
svgRoot.setAttribute('xmlns', 'http://www.w3.org/2000/svg');
svgRoot.setAttribute('version', '1.1');
svgRoot.setAttribute('baseProfile', 'full');
svgRoot.style['user-select'] = 'none';
svgRoot.style.cssText = 'position:absolute;left:0;top:0;';

this.gradientManager = new GradientManager(svgRoot);
this.clipPathManager = new ClippathManager(svgRoot);

var viewport = document.createElement('div');
viewport.style.cssText = 'overflow: hidden;';
viewport.style.cssText = 'overflow:hidden;position:relative';

this._svgRoot = svgRoot;
this._viewport = viewport;

root.appendChild(viewport);
viewport.appendChild(svgRoot);

this.resize();
this.resize(opts.width, opts.height);

this._visibleList = [];
};
Expand Down Expand Up @@ -74636,15 +74641,26 @@ SVGPainter.prototype = {
}
},

resize: function () {
var width = this._getWidth();
var height = this._getHeight();
resize: function (width, height) {
var viewport = this._viewport;
// FIXME Why ?
viewport.style.display = 'none';

// Save input w/h
var opts = this._opts;
width != null && (opts.width = width);
height != null && (opts.height = height);

width = this._getSize(0);
height = this._getSize(1);

viewport.style.display = '';

if (this._width !== width && this._height !== height) {
this._width = width;
this._height = height;

var viewportStyle = this._viewport.style;
var viewportStyle = viewport.style;
viewportStyle.width = width + 'px';
viewportStyle.height = height + 'px';

Expand All @@ -74655,30 +74671,40 @@ SVGPainter.prototype = {
}
},

/**
* 获取绘图区域宽度
*/
getWidth: function () {
return this._getWidth();
return this._width;
},

/**
* 获取绘图区域高度
*/
getHeight: function () {
return this._getHeight();
return this._height;
},

_getWidth: function () {
var root = this.root;
var stl = document.defaultView.getComputedStyle(root);
_getSize: function (whIdx) {
var opts = this._opts;
var wh = ['width', 'height'][whIdx];
var cwh = ['clientWidth', 'clientHeight'][whIdx];
var plt = ['paddingLeft', 'paddingTop'][whIdx];
var prb = ['paddingRight', 'paddingBottom'][whIdx];

return ((root.clientWidth || parseInt10$2(stl.width))
- parseInt10$2(stl.paddingLeft)
- parseInt10$2(stl.paddingRight)) | 0;
},
if (opts[wh] != null && opts[wh] !== 'auto') {
return parseFloat(opts[wh]);
}

_getHeight: function () {
var root = this.root;
// IE8 does not support getComputedStyle, but it use VML.
var stl = document.defaultView.getComputedStyle(root);

return ((root.clientHeight || parseInt10$2(stl.height))
- parseInt10$2(stl.paddingTop)
- parseInt10$2(stl.paddingBottom)) | 0;
return (
(root[cwh] || parseInt10$2(stl[wh]) || parseInt10$2(root.style[wh]))
- (parseInt10$2(stl[plt]) || 0)
- (parseInt10$2(stl[prb]) || 0)
) | 0;
},

dispose: function () {
Expand Down
2 changes: 1 addition & 1 deletion dist/echarts-en.js.map
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/echarts-en.min.js
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/echarts-en.simple.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10160,7 +10160,7 @@ var painterCtors = {
/**
* @type {string}
*/
var version$1 = '3.7.3';
var version$1 = '3.7.4';

/**
* Initializing a zrender instance
Expand Down Expand Up @@ -20320,10 +20320,10 @@ var loadingDefault = function (api, opts) {
var each = each$1;
var parseClassType = ComponentModel.parseClassType;

var version = '3.8.4';
var version = '3.8.5';

var dependencies = {
zrender: '3.7.3'
zrender: '3.7.4'
};

var PRIORITY_PROCESSOR_FILTER = 1000;
Expand Down
2 changes: 1 addition & 1 deletion dist/echarts-en.simple.min.js
View file

Large diffs are not rendered by default.

Loading

0 comments on commit eb95d20

Please sign in to comment.