Skip to content

Commit

Permalink
Release 4.0.7
Browse files Browse the repository at this point in the history
  • Loading branch information
100pah committed Feb 25, 2019
1 parent 5a201e8 commit d5a4349
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 9 deletions.
15 changes: 10 additions & 5 deletions dist/zrender.js
Original file line number Diff line number Diff line change
Expand Up @@ -7466,7 +7466,7 @@ function getWidth(text, font) {
*/
function getBoundingRect(text, font, textAlign, textVerticalAlign, textPadding, textLineHeight, rich, truncate) {
return rich
? getRichTextRect(text, font, textAlign, textVerticalAlign, textPadding, rich, textLineHeight, truncate)
? getRichTextRect(text, font, textAlign, textVerticalAlign, textPadding, textLineHeight, rich, truncate)
: getPlainTextRect(text, font, textAlign, textVerticalAlign, textPadding, textLineHeight, truncate);
}

Expand Down Expand Up @@ -10836,7 +10836,7 @@ var instances = {}; // ZRender实例map索引
/**
* @type {string}
*/
var version = '4.0.6';
var version = '4.0.7';

/**
* Initializing a zrender instance
Expand Down Expand Up @@ -14311,6 +14311,7 @@ Text.prototype = {
style.textAlign,
style.textVerticalAlign,
style.textPadding,
style.textLineHeight,
style.rich
);

Expand Down Expand Up @@ -16851,8 +16852,10 @@ var svgTextDrawRectText = function (el, rect, textRect) {

var verticalAlign = getVerticalAlignForSvg(style.textVerticalAlign);

textRect = getBoundingRect(text, font, align,
verticalAlign, style.textPadding, style.textLineHeight);
textRect = getBoundingRect(
text, font, align,
verticalAlign, style.textPadding, style.textLineHeight
);

var lineHeight = textRect.lineHeight;
// Text position represented by coord
Expand Down Expand Up @@ -19322,7 +19325,9 @@ if (!env$1.canvasSupported) {
var font = fontStyle.style + ' ' + fontStyle.variant + ' ' + fontStyle.weight + ' '
+ fontStyle.size + 'px "' + fontStyle.family + '"';

textRect = textRect || getBoundingRect(text, font, align, verticalAlign, style.textPadding, style.textLineHeight);
textRect = textRect || getBoundingRect(
text, font, align, verticalAlign, style.textPadding, style.textLineHeight
);

// Transform rect to view space
var m = this.transform;
Expand Down
2 changes: 1 addition & 1 deletion dist/zrender.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/zrender.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "zrender",
"version": "4.0.6",
"version": "4.0.7",
"description": "A lightweight canvas library.",
"keywords": [
"canvas",
Expand Down
2 changes: 1 addition & 1 deletion src/zrender.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ var instances = {}; // ZRender实例map索引
/**
* @type {string}
*/
export var version = '4.0.6';
export var version = '4.0.7';

/**
* Initializing a zrender instance
Expand Down

0 comments on commit d5a4349

Please sign in to comment.