This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
The following commit(s) were added to refs/heads/master by this push:
new c3f1f54 refactor(tooltip): improve rich tooltip
c3f1f54 is described below
commit c3f1f5492d68b5cf5953284b6a150b0074c97869
Author: Ovilia <zwl.s...@gmail.com>
AuthorDate: Fri Jul 27 14:35:55 2018 +0800
refactor(tooltip): improve rich tooltip
---
src/component/tooltip/TooltipModel.js | 4 ++--
src/component/tooltip/TooltipRichContent.js | 10 ----------
src/component/tooltip/TooltipView.js | 4 ++--
src/model/Series.js | 6 +++---
src/util/format.js | 2 +-
5 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/src/component/tooltip/TooltipModel.js
b/src/component/tooltip/TooltipModel.js
index b115871..27047be 100644
--- a/src/component/tooltip/TooltipModel.js
+++ b/src/component/tooltip/TooltipModel.js
@@ -46,10 +46,10 @@ export default echarts.extendComponentModel({
displayMode: 'single', // 'single' | 'multipleByCoordSys'
- renderMode: 'auto', // 'auto' | 'html' | 'richtext'
+ renderMode: 'auto', // 'auto' | 'html' | 'richText'
// 'auto': use html by default, and use non-html if `document` is not
defined
// 'html': use html for tooltip
- // 'richtext': use canvas, svg, and etc. for tooltip
+ // 'richText': use canvas, svg, and etc. for tooltip
// 位置 {Array} | {Function}
// position: null
diff --git a/src/component/tooltip/TooltipRichContent.js
b/src/component/tooltip/TooltipRichContent.js
index d7df394..cfc69b1 100644
--- a/src/component/tooltip/TooltipRichContent.js
+++ b/src/component/tooltip/TooltipRichContent.js
@@ -119,16 +119,6 @@ TooltipRichContent.prototype = {
}
self._inContent = true;
});
- this.el.on('mousemove', function (e) {
- e = e || window.event;
- if (!self._enterable) {
- // Try trigger zrender event to avoid mouse
- // in and out shape too frequently
- var handler = zr.handler;
- eventUtil.normalizeEvent(container, e, true);
- handler.dispatch('mousemove', e);
- }
- });
this.el.on('mouseout', function () {
if (self._enterable) {
if (self._show) {
diff --git a/src/component/tooltip/TooltipView.js
b/src/component/tooltip/TooltipView.js
index 4647cbe..2c27063 100644
--- a/src/component/tooltip/TooltipView.js
+++ b/src/component/tooltip/TooltipView.js
@@ -53,8 +53,8 @@ export default echarts.extendComponentView({
var renderMode = tooltipModel.get('renderMode');
this._renderMode = 'html';
if (renderMode === 'auto') {
- // using html when `document` exists, use richtext otherwise
- this._renderMode = document ? 'html' : 'richtext';
+ // using html when `document` exists, use richText otherwise
+ this._renderMode = env.domSupported ? 'html' : 'richText';
}
else {
this._renderMode = renderMode || this._renderMode;
diff --git a/src/model/Series.js b/src/model/Series.js
index af39fc4..9f3213e 100644
--- a/src/model/Series.js
+++ b/src/model/Series.js
@@ -303,10 +303,10 @@ var SeriesModel = ComponentModel.extend({
* @param {number} dataIndex
* @param {boolean} [multipleSeries=false]
* @param {number} [dataType]
- * @param {string} [renderMode='html'] valid values: 'html' and 'richtext'.
+ * @param {string} [renderMode='html'] valid values: 'html' and 'richText'.
* 'html' is used for rendering
tooltip in extra DOM form, and the result
* string is used as DOM HTML content.
- * 'richtext' is used for rendering
tooltip in rich text form, for those where
+ * 'richText' is used for rendering
tooltip in rich text form, for those where
* DOM operation is not supported.
* @return {Object} formatted tooltip with `html` and `markers`
*/
@@ -315,7 +315,7 @@ var SeriesModel = ComponentModel.extend({
var series = this;
renderMode = renderMode || 'html';
var newLine = renderMode === 'html' ? '<br/>' : '\n';
- var isRichText = renderMode === 'richtext';
+ var isRichText = renderMode === 'richText';
var markers = {};
var markerId = 0;
diff --git a/src/util/format.js b/src/util/format.js
index 0f0581b..49147bb 100644
--- a/src/util/format.js
+++ b/src/util/format.js
@@ -136,7 +136,7 @@ export function formatTplSimple(tpl, param, encode) {
* @param {string} [opt.color]
* @param {string} [opt.extraCssText]
* @param {string} [opt.type='item'] 'item' or 'subItem'
- * @param {string} [opt.renderMode='html'] render mode of tooltip, 'html' or
'richtext'
+ * @param {string} [opt.renderMode='html'] render mode of tooltip, 'html' or
'richText'
* @param {string} [opt.markerId='X'] id name for marker. If only one marker
is in a rich text, this can be omitted.
* @return {string}
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
