Merge pull request #6 from cernops/5.5.2

Upgrading to 5.5.2
cernops · Aug 31, 2017 · 99cdfc6 · 99cdfc6
2 parents 8996db9 + 9d2d5b8
commit 99cdfc6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/public/relationalFilterController.js b/public/relationalFilterController.js
@@ -1,6 +1,7 @@
 // Create an Angular module for this plugin
+import { uiModules } from 'ui/modules';
 var module = require('ui/modules').get('relational_filter');
-import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter';
+import { FilterBarQueryFilterProvider } from 'ui/filter_bar/query_filter';
 
 module.controller('relationalFilterController', function($scope, Private) {
 
@@ -162,4 +163,4 @@ module.controller('relationalFilterController', function($scope, Private) {
 
     });
 
-});
+});
diff --git a/public/relational_filter.js b/public/relational_filter.js
@@ -1,14 +1,22 @@
 require('plugins/relational_filter/relationalFilterController');
 
+import { TemplateVisTypeProvider } from 'ui/template_vis_type/template_vis_type';
+import { VisTypesRegistryProvider } from 'ui/registry/vis_types';
+import { VisSchemasProvider } from 'ui/vis/schemas';
+import { uiModules } from 'ui/modules';
+
+
 import optionsTemplate from 'plugins/relational_filter/filter_options.html';
 
 
 
+
+
 // The provider function, which must return our new visualization type
 function RelationalFilterProvider(Private) {
-    var TemplateVisType = Private(require('ui/template_vis_type/template_vis_type'));
+    const TemplateVisType = Private(TemplateVisTypeProvider);
     // Include the Schemas class, which will be used to define schemas
-    var Schemas = Private(require('ui/vis/schemas'));
+    var Schemas = Private(VisSchemasProvider);
 
     // Describe our visualization
     return new TemplateVisType({
@@ -52,4 +60,4 @@ function RelationalFilterProvider(Private) {
 	});
 }
 
-require('ui/registry/vis_types').register(RelationalFilterProvider);
+VisTypesRegistryProvider.register(RelationalFilterProvider);