Toggling spy panel no longer throws an error

thomasneirynck · thomasneirynck · commit 0de553d37ba7 · 2016-10-28T14:06:05.000-04:00
diff --git a/src/ui/public/filter_bar/filter_bar.js b/src/ui/public/filter_bar/filter_bar.js
@@ -1,7 +1,5 @@
 import _ from 'lodash';
 import template from 'ui/filter_bar/filter_bar.html';
-import moment from 'moment';
-import angular from 'angular';
 import 'ui/directives/json_input';
 import filterAppliedAndUnwrap from 'ui/filter_bar/lib/filter_applied_and_unwrap';
 import FilterBarLibMapAndFlattenFiltersProvider from 'ui/filter_bar/lib/map_and_flatten_filters';
diff --git a/src/ui/public/vislib/lib/dispatch.js b/src/ui/public/vislib/lib/dispatch.js
@@ -101,9 +101,7 @@ export default function DispatchClass(Private, config) {
       const isClickable = this.listenerCount('click') > 0;
       const addEvent = this.addEvent;
       const $el = this.handler.el;
-      if (!this.handler.highlight) {
-        this.handler.highlight = self.highlight;
-      }
+      this.handler.highlight = self.highlight;
 
       function hover(d, i) {
         // Add pointer if item is clickable
@@ -127,9 +125,7 @@ export default function DispatchClass(Private, config) {
       const self = this;
       const addEvent = this.addEvent;
       const $el = this.handler.el;
-      if (!this.handler.unHighlight) {
-        this.handler.unHighlight = self.unHighlight;
-      }
+      this.handler.unHighlight = self.unHighlight;
 
       function mouseout() {
         self.handler.unHighlight.call(this, $el);
diff --git a/src/ui/public/vislib/lib/handler/handler.js b/src/ui/public/vislib/lib/handler/handler.js
@@ -20,7 +20,6 @@ export default function HandlerBaseClass(Private) {
    */
   class Handler {
     constructor(vis, opts) {
-
       this.data = opts.data || new Data(vis.data, vis._attr, vis.uiState);
       this.vis = vis;
       this.el = vis.el;
@@ -77,6 +76,17 @@ export default function HandlerBaseClass(Private) {
        * @returns {*}
        */
       this.disable = this.chartEventProxyToggle('off');
+
+    }
+
+
+    /**
+     * Clients expect the Handler-type to have a highlight/unhighlight functions. The default implementation is a noop.
+     * Specific implementations are free to override this.
+     */
+    highlight() {
+    }
+    unHighlight() {
     }
 
     /**
diff --git a/src/ui/public/visualize/visualize_legend.js b/src/ui/public/visualize/visualize_legend.js
@@ -1,8 +1,5 @@
 import _ from 'lodash';
 import html from 'ui/visualize/visualize_legend.html';
-import $ from 'jquery';
-import d3 from 'd3';
-import findByParam from 'ui/utils/find_by_param';
 import VislibLibDataProvider from 'ui/vislib/lib/data';
 import VislibComponentsColorColorProvider from 'ui/vislib/components/color/color';
 import FilterBarFilterBarClickHandlerProvider from 'ui/filter_bar/filter_bar_click_handler';
@@ -18,7 +15,7 @@ uiModules.get('kibana')
   return {
     restrict: 'E',
     template: html,
-    link: function ($scope, $elem) {
+    link: function ($scope) {
       let $state = getAppState();
       let clickHandler = filterBarClickHandler($state);
       $scope.open = $scope.uiState.get('vis.legendOpen', true);
@@ -32,7 +29,9 @@ uiModules.get('kibana')
       $scope.highlight = function (event) {
         let el = event.currentTarget;
         let handler = $scope.renderbot.vislibVis.handler;
-        if (!handler) return;
+        if (!handler) {
+          return;
+        }
         handler.highlight.call(el, handler.el);
       };
 
@@ -110,7 +109,7 @@ uiModules.get('kibana')
         data = data.columns || data.rows || [data];
         if (type === 'pie') return Data.prototype.pieNames(data);
         return getSeriesLabels(data);
-      };
+      }
 
       function getSeriesLabels(data) {
         let values = data.map(function (chart) {
