refactor: do not support triggerOn callback usage for tooltip and leg…

…end.
antvis · Jul 30, 2018 · 33624cb · 33624cb
1 parent d507b92
commit 33624cb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/src/plugin/legend.js b/src/plugin/legend.js
@@ -359,22 +359,14 @@ class LegendController {
     const legendCfg = this.legendCfg;
     const triggerOn = legendCfg.triggerOn || 'touchstart';
     const method = Util.wrapBehavior(this, 'handleEvent');
-    if (Util.isFunction(triggerOn)) {
-      triggerOn(method, 'bind');
-    } else {
-      Util.addEventListener(this.canvasDom, triggerOn, method);
-    }
+    Util.addEventListener(this.canvasDom, triggerOn, method);
   }
 
   unBindEvents() {
     const legendCfg = this.legendCfg;
     const triggerOn = legendCfg.triggerOn || 'touchstart';
     const method = Util.getWrapBehavior(this, 'handleEvent');
-    if (Util.isFunction(triggerOn)) {
-      triggerOn(method, 'unBind');
-    } else {
-      Util.removeEventListener(this.canvasDom, triggerOn, method);
-    }
+    Util.removeEventListener(this.canvasDom, triggerOn, method);
   }
 }
 module.exports = {

diff --git a/src/plugin/tooltip.js b/src/plugin/tooltip.js
@@ -410,9 +410,7 @@ class TooltipController {
   _handleEvent(methodName, method, action) {
     const canvasDom = this.canvasDom;
     Util.each([].concat(methodName), aMethod => {
-      if (Util.isFunction(aMethod)) {
-        aMethod(method, action); // TODO： 测试，供用户自己绑定事件
-      } else if (action === 'bind') {
+      if (action === 'bind') {
         Util.addEventListener(canvasDom, aMethod, method);
       } else {
         Util.removeEventListener(canvasDom, aMethod, method);