pass in raw DOM element, not jquery collection

elastic · May 19, 2017 · 78bcc79 · 78bcc79
1 parent 600ca38
commit 78bcc79
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 15 deletions.
diff --git a/src/core_plugins/tile_map/public/maps_visualization.js b/src/core_plugins/tile_map/public/maps_visualization.js
@@ -1,14 +1,15 @@
 import 'ui/vislib';
 import 'plugins/kbn_vislib_vis_types/controls/vislib_basic_options';
 import MapsVisTypeMapsRenderbotProvider from './maps_renderbot';
+import $ from 'jquery';
 
 export function MapsVisualizationProvider(Private) {
 
   const MapsRenderbot = Private(MapsVisTypeMapsRenderbotProvider);
 
   class MapsVisController {
     constructor(el) {
-      this.el = el;
+      this.el = $(el);
     }
 
     render(vis, esResponse) {

diff --git a/src/ui/public/vis/vis_types/angular_vis_type.js b/src/ui/public/vis/vis_types/angular_vis_type.js
@@ -1,11 +1,13 @@
 import { VisTypeProvider } from 'ui/vis/vis_types';
+import $ from 'jquery';
+
 
 export function AngularVisTypeProvider(Private, $compile, $rootScope) {
   const VisType = Private(VisTypeProvider);
 
   class AngularVisController {
-    constructor(el) {
-      this.el = el;
+    constructor(domeElement) {
+      this.el = $(domeElement);
     }
 
     render(vis, esResponse) {

diff --git a/src/ui/public/vis/vis_types/react_vis_type.js b/src/ui/public/vis/vis_types/react_vis_type.js
@@ -7,7 +7,7 @@ export function ReactVisTypeProvider(Private) {
 
   class ReactVisController {
     constructor(el) {
-      this.el = el[0];
+      this.el = el;
     }
 
     render(vis, visData) {

diff --git a/src/ui/public/vis/vis_types/vislib_vis_type.js b/src/ui/public/vis/vis_types/vislib_vis_type.js
@@ -15,7 +15,7 @@ export function VislibVisTypeProvider(Private) {
 
   class VislibVisController {
     constructor(el) {
-      this.el = el[0];
+      this.el = el;
     }
 
     render(vis, esResponse) {

diff --git a/src/ui/public/visualize/visualization.js b/src/ui/public/visualize/visualization.js
@@ -7,6 +7,8 @@ import visualizationTemplate from 'ui/visualize/visualization.html';
 import 'angular-sanitize';
 
 
+
+
 uiModules
 .get('kibana/directive', ['ngSanitize'])
 .directive('visualization', function (Notifier, SavedVis, indexPatterns, Private, config, $timeout) {
@@ -25,16 +27,11 @@ uiModules
 
       $scope.showSpyPanel = $scope.vis && $scope.vis.showSpyPanel || false;
 
-      function getter(selector) {
-        return function () {
-          const $sel = $el.find(selector);
-          if ($sel.size()) return $sel;
-        };
-      }
 
-      const getVisEl = getter('.visualize-chart');
-      const getVisContainer = getter('.vis-container');
-      const getSpyContainer = getter('.visualize-spy-container');
+      //todo: lets make this a simple function call.
+      const getVisEl = jQueryGetter('.visualize-chart');
+      const getVisContainer = jQueryGetter('.vis-container');
+      const getSpyContainer = jQueryGetter('.visualize-spy-container');
 
       // Show no results message when isZeroHits is true and it requires search
       $scope.showNoResultsMessage = function () {
@@ -105,7 +102,9 @@ uiModules
       });
 
       const Visualization = $scope.vis.type.visualization;
-      const visualization = new Visualization(getVisEl());
+
+      //todo: make this not a jquery element
+      const visualization = new Visualization(getVisEl()[0]);
 
       const renderFunction = _.debounce(() => {
         visualization.render($scope.vis, $scope.visData)
@@ -125,6 +124,14 @@ uiModules
       $scope.$on('$destroy', () => {
         visualization.destroy();
       });
+
+
+      function jQueryGetter(selector) {
+        return function () {
+          const $sel = $el.find(selector);
+          if ($sel.size()) return $sel;
+        };
+      }
     }
   };
 });