You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by su...@apache.org on 2019/01/02 20:10:50 UTC
[incubator-echarts] 01/02: Merge branch 'release'
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 82bc19ed3390562bb2237df3eff80690dd737193
Merge: 1cbe455 edd23af
Author: sushuang <su...@gmail.com>
AuthorDate: Thu Jan 3 04:07:43 2019 +0800
Merge branch 'release'
src/util/graphic.js | 4 +---
test/hoverStyle.html | 36 +++++++++++++++++++++++++++++++++++-
2 files changed, 36 insertions(+), 4 deletions(-)
diff --cc src/util/graphic.js
index f821f9d,e490f76..80bf97a
--- a/src/util/graphic.js
+++ b/src/util/graphic.js
@@@ -355,13 -381,10 +354,12 @@@ function singleEnterNormal(el)
// when `el` is on emphasis state. So here by comparing with 1, we try
// hard to make the bug case rare.
var normalZ2 = el.__cachedNormalZ2;
- if (el.z2 - normalZ2 === Z2_LIFT_VALUE) {
+ if (normalZ2 != null && el.z2 - normalZ2 === Z2_LIFT_VALUE) {
el.z2 = normalZ2;
- el.__cachedNormalZ2 = null;
}
}
+
+ el.__extraOnNormal && el.__extraOnNormal();
}
function traverseCall(el, method) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org