Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release to master #830

Merged
merged 4 commits into from
Sep 22, 2021
Merged

Merge release to master #830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6040619
Merge pull request #827 from ecomfe/master
pissang Sep 16, 2021
5e55e00
Release 5.2.1
pissang Sep 17, 2021
8bf1a9c
update package-lock.json
pissang Sep 17, 2021
0fbf9b3
Merge pull request #828 from ecomfe/release-dev
pissang Sep 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 26 additions & 23 deletions dist/zrender.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@
var nativeMap = arrayProto.map;
var ctorFunction = function () { }.constructor;
var protoFunction = ctorFunction ? ctorFunction.prototype : null;
var protoKey = '__proto__';
var methods = {};
function $override(name, fn) {
methods[name] = fn;
Expand Down Expand Up @@ -164,7 +165,7 @@
else if (!BUILTIN_OBJECT[typeStr] && !isPrimitive(source) && !isDom(source)) {
result = {};
for (var key in source) {
if (source.hasOwnProperty(key)) {
if (source.hasOwnProperty(key) && key !== protoKey) {
result[key] = clone(source[key]);
}
}
Expand All @@ -176,7 +177,7 @@
return overwrite ? clone(source) : target;
}
for (var key in source) {
if (source.hasOwnProperty(key)) {
if (source.hasOwnProperty(key) && key !== protoKey) {
var targetProp = target[key];
var sourceProp = source[key];
if (isObject(sourceProp)
Expand Down Expand Up @@ -211,7 +212,7 @@
}
else {
for (var key in source) {
if (source.hasOwnProperty(key)) {
if (source.hasOwnProperty(key) && key !== protoKey) {
target[key] = source[key];
}
}
Expand Down Expand Up @@ -1173,6 +1174,7 @@
calculateZrXY(el, e, out);
}
else if (env.browser.firefox
&& env.browser.version < '39'
&& e.layerX != null
&& e.layerX !== e.offsetX) {
out.zrX = e.layerX;
Expand Down Expand Up @@ -2130,7 +2132,7 @@
ts.forceMergeRuns();
}

var REDARAW_BIT = 1;
var REDRAW_BIT = 1;
var STYLE_CHANGED_BIT = 2;
var SHAPE_CHANGED_BIT = 4;

Expand Down Expand Up @@ -2214,7 +2216,7 @@
for (var i = 0; i < children.length; i++) {
var child = children[i];
if (el.__dirty) {
child.__dirty |= REDARAW_BIT;
child.__dirty |= REDRAW_BIT;
}
this._updateAndAddDisplayable(child, clipPaths, includeIgnore);
}
Expand Down Expand Up @@ -5275,7 +5277,7 @@
innerTextDefaultStyle.verticalAlign = textVerticalAlign;
textEl.setDefaultTextStyle(innerTextDefaultStyle);
}
textEl.__dirty |= REDARAW_BIT;
textEl.__dirty |= REDRAW_BIT;
if (textStyleChanged) {
textEl.dirtyStyle(true);
}
Expand Down Expand Up @@ -5452,7 +5454,7 @@
this.markRedraw();
if (!useHoverLayer && this.__inHover) {
this._toggleHoverLayerFlag(false);
this.__dirty &= ~REDARAW_BIT;
this.__dirty &= ~REDRAW_BIT;
}
return state;
};
Expand Down Expand Up @@ -5511,7 +5513,7 @@
this.markRedraw();
if (!useHoverLayer && this.__inHover) {
this._toggleHoverLayerFlag(false);
this.__dirty &= ~REDARAW_BIT;
this.__dirty &= ~REDRAW_BIT;
}
}
};
Expand Down Expand Up @@ -5722,7 +5724,7 @@
}
};
Element.prototype.markRedraw = function () {
this.__dirty |= REDARAW_BIT;
this.__dirty |= REDRAW_BIT;
var zr = this.__zr;
if (zr) {
if (this.__inHover) {
Expand Down Expand Up @@ -5871,7 +5873,7 @@
elProto.dragging = false;
elProto.ignoreClip = false;
elProto.__inHover = false;
elProto.__dirty = REDARAW_BIT;
elProto.__dirty = REDRAW_BIT;
var logs = {};
function logDeprecatedError(key, xKey, yKey) {
if (!logs[key + xKey + yKey]) {
Expand Down Expand Up @@ -6542,7 +6544,7 @@
function registerPainter(name, Ctor) {
painterCtors[name] = Ctor;
}
var version = '5.2.0';
var version = '5.2.1';

var STYLE_MAGIC_KEY = '__zr_style_' + Math.round((Math.random() * 10));
var DEFAULT_COMMON_STYLE = {
Expand Down Expand Up @@ -6847,7 +6849,7 @@
dispProto.incremental = false;
dispProto._rect = null;
dispProto.dirtyRectTolerance = 0;
dispProto.__dirty = REDARAW_BIT | STYLE_CHANGED_BIT;
dispProto.__dirty = REDRAW_BIT | STYLE_CHANGED_BIT;
})();
return Displayable;
}(Element));
Expand Down Expand Up @@ -8628,7 +8630,7 @@
for (var i = 0; i < pathCopyParams.length; ++i) {
decalEl[pathCopyParams[i]] = this[pathCopyParams[i]];
}
decalEl.__dirty |= REDARAW_BIT;
decalEl.__dirty |= REDRAW_BIT;
}
else if (this._decalEl) {
this._decalEl = null;
Expand Down Expand Up @@ -8954,7 +8956,7 @@
pathProto.segmentIgnoreThreshold = 0;
pathProto.subPixelOptimize = false;
pathProto.autoBatch = false;
pathProto.__dirty = REDARAW_BIT | STYLE_CHANGED_BIT | SHAPE_CHANGED_BIT;
pathProto.__dirty = REDRAW_BIT | STYLE_CHANGED_BIT | SHAPE_CHANGED_BIT;
})();
return Path;
}(Displayable));
Expand Down Expand Up @@ -10379,7 +10381,7 @@
inheritStyle(parentGroup, img);
parseAttributes(xmlNode, img, this._defsUsePending, false, false);
img.setStyle({
image: xmlNode.getAttribute('xlink:href'),
image: xmlNode.getAttribute('xlink:href') || xmlNode.getAttribute('href'),
x: +xmlNode.getAttribute('x'),
y: +xmlNode.getAttribute('y'),
width: +xmlNode.getAttribute('width'),
Expand Down Expand Up @@ -14377,7 +14379,7 @@
function brush(ctx, el, scope, isLast) {
var m = el.transform;
if (!el.shouldBePainted(scope.viewWidth, scope.viewHeight, false, false)) {
el.__dirty &= ~REDARAW_BIT;
el.__dirty &= ~REDRAW_BIT;
el.__isRendered = false;
return;
}
Expand Down Expand Up @@ -14663,13 +14665,13 @@
var el = displayList[i];
if (el) {
var shouldPaint = el.shouldBePainted(viewWidth, viewHeight, true, true);
var prevRect = el.__isRendered && ((el.__dirty & REDARAW_BIT) || !shouldPaint)
var prevRect = el.__isRendered && ((el.__dirty & REDRAW_BIT) || !shouldPaint)
? el.getPrevPaintRect()
: null;
if (prevRect) {
addRectToMergePool(prevRect);
}
var curRect = shouldPaint && ((el.__dirty & REDARAW_BIT) || !el.__isRendered)
var curRect = shouldPaint && ((el.__dirty & REDRAW_BIT) || !el.__isRendered)
? el.getPaintRect()
: null;
if (curRect) {
Expand Down Expand Up @@ -15277,7 +15279,7 @@
updatePrevLayer(i);
prevLayer = layer;
}
if ((el.__dirty & REDARAW_BIT) && !el.__inHover) {
if ((el.__dirty & REDRAW_BIT) && !el.__inHover) {
layer.__dirty = true;
if (layer.incremental && layer.__drawIndex < 0) {
layer.__drawIndex = i;
Expand Down Expand Up @@ -15712,7 +15714,7 @@
function bindStyle(svgEl, style, el) {
var opacity = style.opacity == null ? 1 : style.opacity;
if (el instanceof ZRImage) {
svgEl.style.opacity = opacity + '';
attr(svgEl, 'opacity', opacity + '');
return;
}
if (pathHasFill(style)) {
Expand Down Expand Up @@ -15753,7 +15755,7 @@
attr(svgEl, 'stroke-dashoffset', (lineDashOffset || 0) + '');
}
else {
attr(svgEl, 'stroke-dasharray', '');
attr(svgEl, 'stroke-dasharray', NONE);
}
style.lineCap && attr(svgEl, 'stroke-linecap', style.lineCap);
style.lineJoin && attr(svgEl, 'stroke-linejoin', style.lineJoin);
Expand Down Expand Up @@ -16585,7 +16587,7 @@
ShadowManager.prototype.remove = function (svgElement, displayable) {
if (displayable._shadowDom != null) {
displayable._shadowDom = null;
svgElement.style.filter = '';
svgElement.removeAttribute('filter');
}
};
ShadowManager.prototype.updateDom = function (svgElement, displayable, shadowDom) {
Expand Down Expand Up @@ -16615,7 +16617,7 @@
shadowDom.setAttribute('height', '300%');
displayable._shadowDom = shadowDom;
var id = shadowDom.getAttribute('id');
svgElement.style.filter = 'url(#' + id + ')';
svgElement.setAttribute('filter', 'url(#' + id + ')');
};
ShadowManager.prototype.removeUnused = function () {
var defs = this.getDefs(false);
Expand Down Expand Up @@ -16957,6 +16959,7 @@
exports.Circle = Circle;
exports.CircleShape = CircleShape;
exports.CompoundPath = CompoundPath;
exports.Displayable = Displayable;
exports.Droplet = Droplet;
exports.DropletShape = DropletShape;
exports.Element = Element;
Expand Down
2 changes: 1 addition & 1 deletion dist/zrender.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/zrender.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "zrender",
"version": "5.2.0",
"version": "5.2.1",
"description": "A lightweight canvas library.",
"keywords": [
"canvas",
Expand Down Expand Up @@ -52,4 +52,4 @@
"typescript": "4.3.5",
"uglify-js": "^3.10.0"
}
}
}
2 changes: 1 addition & 1 deletion src/zrender.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ export function registerPainter(name: string, Ctor: PainterBaseCtor) {
/**
* @type {string}
*/
export const version = '5.2.0';
export const version = '5.2.1';


export interface ZRenderType extends ZRender {};