Skip to content

Commit

Permalink
release 3.5.2
Browse files Browse the repository at this point in the history
  • Loading branch information
100pah committed Jun 15, 2017
1 parent 6689bba commit 9f9c50d
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 8 deletions.
12 changes: 9 additions & 3 deletions build/zrender.js
Original file line number Diff line number Diff line change
Expand Up @@ -7095,6 +7095,12 @@ define('zrender/graphic/Style',['require'],function (require) {
*/
textPosition: 'inside',

/**
* If not specified, use the boundingRect of a `displayable`.
* @type {Object}
*/
textPositionRect: null,

/**
* [x, y]
* @type {Array.<number>}
Expand Down Expand Up @@ -7857,6 +7863,7 @@ define('zrender/graphic/mixin/RectText',['require','../../contain/text','../../c
var font = style.textFont || style.font;
var baseline = style.textBaseline;
var verticalAlign = style.textVerticalAlign;
rect = style.textPositionRect || rect;

textRect = textRect || textContain.getBoundingRect(text, font, align, baseline);

Expand Down Expand Up @@ -7941,7 +7948,7 @@ define('zrender/graphic/mixin/RectText',['require','../../contain/text','../../c
}

for (var i = 0; i < textLines.length; i++) {
// Fill after stroke so the outline will not cover the main part.
// Fill after stroke so the outline will not cover the main part.
textStroke && ctx.strokeText(textLines[i], x, y);
textFill && ctx.fillText(textLines[i], x, y);
y += textRect.lineHeight;
Expand Down Expand Up @@ -9526,7 +9533,7 @@ define('zrender/zrender',['require','./core/guid','./core/env','./core/util','./
/**
* @type {string}
*/
zrender.version = '3.5.1';
zrender.version = '3.5.2';

/**
* Initializing a zrender instance
Expand Down Expand Up @@ -12393,7 +12400,6 @@ define('zrender/graphic/Path',['require','./Displayable','../core/util','../core

// Draw rect text
if (style.text != null) {
// var rect = this.getBoundingRect();
this.drawRectText(ctx, this.getBoundingRect());
}
},
Expand Down
6 changes: 3 additions & 3 deletions build/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": "3.5.1",
"version": "3.5.2",
"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 @@ -31,7 +31,7 @@ define(function(require) {
/**
* @type {string}
*/
zrender.version = '3.5.1';
zrender.version = '3.5.2';

/**
* Initializing a zrender instance
Expand Down

0 comments on commit 9f9c50d

Please sign in to comment.