Use a filter function instead of string concatonation

elastic · Mar 1, 2016 · a7074da · repocho · Mar 5, 2016 · a7074da
1 parent 8992535
commit a7074da
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/src/ui/public/utils/escape_attr.js b/src/ui/public/utils/escape_attr.js
diff --git a/src/ui/public/vislib/lib/dispatch.js b/src/ui/public/vislib/lib/dispatch.js
@@ -1,7 +1,6 @@
 import d3 from 'd3';
 import _ from 'lodash';
 import $ from 'jquery';
-import escapeAttr from 'ui/utils/escape_attr';
 import SimpleEmitter from 'ui/utils/SimpleEmitter';
 import VislibComponentsTooltipProvider from 'ui/vislib/components/Tooltip';
 export default function DispatchClass(Private) {
@@ -231,7 +230,7 @@ export default function DispatchClass(Private) {
   Dispatch.prototype.highlightLegend = function (element) {
     var label = this.getAttribute('data-label');
     if (!label) return;
-    $('[data-label]', element.parentNode).not('[data-label="' + escapeAttr(label) + '"]').css('opacity', 0.5);
+    $('[data-label]', element.parentNode).not(function (els, el) { return $(el).data('label') !== label;}).css('opacity', 0.5);
   };
 
   /**

diff --git a/src/ui/public/visualize/visualize_legend.js b/src/ui/public/visualize/visualize_legend.js
@@ -2,7 +2,6 @@ import _ from 'lodash';
 import html from 'ui/visualize/visualize_legend.html';
 import $ from 'jquery';
 import d3 from 'd3';
-import escapeAttr from 'ui/utils/escape_attr';
 import findByParam from 'ui/utils/find_by_param';
 import VislibLibDataProvider from 'ui/vislib/lib/data';
 import VislibComponentsColorColorProvider from 'ui/vislib/components/color/color';
@@ -31,7 +30,7 @@ uiModules.get('kibana')
       });
 
       $scope.highlightSeries = function (label) {
-        $('[data-label]', $elem.siblings()).not('[data-label="' + escapeAttr(label) + '"]').css('opacity', 0.5);
+        $('[data-label]', $elem.siblings()).not(function (els, el) { return $(el).data('label') !== label;}).css('opacity', 0.5);
       };
 
       $scope.unhighlightSeries = function () {