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/12 17:44:27 UTC

[incubator-echarts] branch master updated (67906e4 -> e0393f2)

This is an automated email from the ASF dual-hosted git repository.

sushuang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.


    from 67906e4  Merge branch 'release'
     add 7d2908f  (1) Fix map rich label missing when missing data (2) Fix map label miss to enter formatter when missing data. (3) Fix #9682
     add 066d7c4  Fix that emphasis listener added repeatly.
     add 36a30df  Fix that emphasis listener added repeatly.
     new 2c166ef  Merge branch 'release'
     new e0393f2  Tweak

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/chart/map/MapSeries.js      |  59 ++++++------
 src/chart/map/MapView.js        | 134 +++++++++++++++++++--------
 src/component/helper/MapDraw.js |   6 +-
 src/data/List.js                | 119 +++++++++++++++++++-----
 src/model/Model.js              |   2 +-
 src/util/graphic.js             |  15 ++-
 test/map.html                   | 199 +++++++++++++++++++++++++++++++++++-----
 7 files changed, 412 insertions(+), 122 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org


[incubator-echarts] 02/02: Tweak

Posted by su...@apache.org.
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 e0393f2c0978b9e187eafac77ff70b05c4ddfba4
Author: sushuang <su...@gmail.com>
AuthorDate: Sun Jan 13 01:44:04 2019 +0800

    Tweak
---
 src/util/graphic.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/util/graphic.js b/src/util/graphic.js
index f5d59dd..7581f6a 100644
--- a/src/util/graphic.js
+++ b/src/util/graphic.js
@@ -516,6 +516,14 @@ export function setHoverStyle(el, hoverStyle) {
  *               for example, when this method is called when `el` is
  *               on "emphasis" state.
  *        @param {string} toState Can be "normal" or "emphasis".
+ *
+ *        FIXME
+ *        CAUTION: Do not expose `highDownOnUpdate` outside echarts.
+ *        Because it is not a complete solution. The update
+ *        listener should not have been mount in element,
+ *        and the normal/emphasis state should not have
+ *        mantained on elements.
+ *
  * @param {boolean} [el.highDownSilentOnTouch=false]
  *        In touch device, mouseover event will be trigger on touchstart event
  *        (see module:zrender/dom/HandlerProxy). By this mechanism, we can


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org


[incubator-echarts] 01/02: Merge branch 'release'

Posted by su...@apache.org.
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 2c166efee23e5028ae7bee73255ce2be84c4d5c8
Merge: 67906e4 36a30df
Author: sushuang <su...@gmail.com>
AuthorDate: Sun Jan 13 01:28:56 2019 +0800

    Merge branch 'release'

 src/chart/map/MapSeries.js      |  59 ++++++------
 src/chart/map/MapView.js        | 134 +++++++++++++++++++--------
 src/component/helper/MapDraw.js |   6 +-
 src/data/List.js                | 119 +++++++++++++++++++-----
 src/model/Model.js              |   2 +-
 src/util/graphic.js             |   7 +-
 test/map.html                   | 199 +++++++++++++++++++++++++++++++++++-----
 7 files changed, 404 insertions(+), 122 deletions(-)

diff --cc src/util/graphic.js
index 69c8e37,f39d0e3..f5d59dd
--- a/src/util/graphic.js
+++ b/src/util/graphic.js
@@@ -48,16 -48,9 +48,17 @@@ var mathMax = Math.max
  var mathMin = Math.min;
  
  var EMPTY_OBJ = {};
- var Z2_LIFT_VALUE = 1;
+ 
+ export var Z2_EMPHASIS_LIFT = 1;
  
 +var EMPHASIS = 'emphasis';
 +var NORMAL = 'normal';
 +
 +// Reserve 0 as default.
 +var _highlightNextDigit = 1;
 +var _highlightKeyMap = {};
 +
 +
  /**
   * Extend shape with parameters
   */


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org