[incubator-echarts] branch master updated: refactor(tooltip): rename getRenderMode to getTooltipRenderMode

[ov...@apache.org]

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 d64c06e  refactor(tooltip): rename getRenderMode to getTooltipRenderMode
     new d38ae04  Merge branch 'master' of github.com:ecomfe/echarts
d64c06e is described below

commit d64c06e223bd37d6314f83e37cae748429765b53
Author: Ovilia <zw...@gmail.com>
AuthorDate: Mon Sep 3 13:11:35 2018 +0800

    refactor(tooltip): rename getRenderMode to getTooltipRenderMode
---
 src/component/tooltip/TooltipView.js | 4 ++--
 src/model/mixin/dataFormat.js        | 4 ++--
 src/util/model.js                    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/component/tooltip/TooltipView.js b/src/component/tooltip/TooltipView.js
index eee0fc0..0631e60 100644
--- a/src/component/tooltip/TooltipView.js
+++ b/src/component/tooltip/TooltipView.js
@@ -31,7 +31,7 @@ import Model from '../../model/Model';
 import * as globalListener from '../axisPointer/globalListener';
 import * as axisHelper from '../../coord/axisHelper';
 import * as axisPointerViewHelper from '../axisPointer/viewHelper';
-import { getRenderMode } from '../../util/model';
+import { getTooltipRenderMode } from '../../util/model';
 
 var bind = zrUtil.bind;
 var each = zrUtil.each;
@@ -52,7 +52,7 @@ export default echarts.extendComponentView({
 
         var tooltipModel = ecModel.getComponent('tooltip');
         var renderMode = tooltipModel.get('renderMode');
-        this._renderMode = getRenderMode(renderMode);
+        this._renderMode = getTooltipRenderMode(renderMode);
 
         var tooltipContent;
         if (this._renderMode === 'html') {
diff --git a/src/model/mixin/dataFormat.js b/src/model/mixin/dataFormat.js
index 84251a1..1595500 100644
--- a/src/model/mixin/dataFormat.js
+++ b/src/model/mixin/dataFormat.js
@@ -19,7 +19,7 @@
 
 import {retrieveRawValue} from '../../data/helper/dataProvider';
 import {getTooltipMarker, formatTpl} from '../../util/format';
-import { getRenderMode } from '../../util/model';
+import { getTooltipRenderMode } from '../../util/model';
 
 var DIMENSION_LABEL_REG = /\{@(.+?)\}/g;
 
@@ -40,7 +40,7 @@ export default {
         var color = data.getItemVisual(dataIndex, 'color');
         var tooltipModel = this.ecModel.getComponent('tooltip');
         var renderModeOption = tooltipModel && tooltipModel.get('renderMode');
-        var renderMode = getRenderMode(renderModeOption);
+        var renderMode = getTooltipRenderMode(renderModeOption);
 
         return {
             componentType: this.mainType,
diff --git a/src/util/model.js b/src/util/model.js
index 65f788f..f80ea06 100644
--- a/src/util/model.js
+++ b/src/util/model.js
@@ -525,7 +525,7 @@ export function getAttribute(dom, key) {
         : dom[key];
 }
 
-export function getRenderMode(renderModeOption) {
+export function getTooltipRenderMode(renderModeOption) {
     if (renderModeOption === 'auto') {
         // Using html when `document` exists, use richText otherwise
         return env.domSupported ? 'html' : 'richText';


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