Directives refactor.

Gruntfile.js

@@ -15,16 +15,7 @@ module.exports = function(grunt) {
         expand: true,
         src: [
           '**/*',
-          '!**/datasource.js',
+          '!**/*.js',
-          '!**/module.js',
-          '!**/query.controller.js',
-          '!**/utils.js',
-          '!**/DataProcessor.js',
-          '!**/zabbixAPICore.service.js',
-          '!**/zabbixAPI.service.js',
-          '!**/queryProcessor.service.js',
-          '!**/zabbixCache.service.js',
-          '!**/metricFunctions.js',
           '!**/*.scss'
         ],
         dest: 'dist/'
@@ -55,16 +46,7 @@ module.exports = function(grunt) {
           cwd: 'src',
           expand: true,
           src: [
-            '**/**/module.js',
+            '**/**/*.js'
-            '**/**/datasource.js',
-            '**/**/query.controller.js',
-            '**/**/utils.js',
-            '**/**/DataProcessor.js',
-            '**/**/zabbixAPICore.service.js',
-            '**/**/zabbixAPI.service.js',
-            '**/**/queryProcessor.service.js',
-            '**/**/zabbixCache.service.js',
-            '**/**/metricFunctions.js'
           ],
           dest: 'dist/'
         }]

src/datasource-zabbix/add-metric-function.directive.js

@@ -1,13 +1,10 @@
-define([
+import angular from 'angular';
-  'angular',
+import _ from 'lodash';
-  'lodash',
+import $ from 'jquery';
-  'jquery',
+import * as metricFunctions from './metricFunctions';
-  './metricFunctions'
-],
-function (angular, _, $, metricFunctions) {
-  'use strict';
 
-  angular
+/** @ngInject */
+angular
   .module('grafana.directives')
   .directive('addMetricFunction', function($compile) {
     var inputTemplate = '<input type="text"'+
@@ -82,16 +79,16 @@ function (angular, _, $, metricFunctions) {
     };
   });
 
-  function getAllFunctionNames(categories) {
+function getAllFunctionNames(categories) {
   return _.reduce(categories, function(list, category) {
     _.each(category, function(func) {
       list.push(func.name);
     });
     return list;
   }, []);
-  }
+}
 
-  function createFunctionDropDownMenu(categories) {
+function createFunctionDropDownMenu(categories) {
   return _.map(categories, function(list, category) {
     return {
       text: category,
@@ -103,5 +100,5 @@ function (angular, _, $, metricFunctions) {
       })
     };
   });
-  }
+}
-});
+

src/datasource-zabbix/metric-function-editor.directive.js

@@ -1,12 +1,9 @@
-define([
+import angular from 'angular';
-  'angular',
+import _ from 'lodash';
-  'lodash',
+import $ from 'jquery';
-  'jquery',
-],
-function (angular, _, $) {
-  'use strict';
 
-  angular
+/** @ngInject */
+angular
   .module('grafana.directives')
   .directive('metricFunctionEditor', function($compile, templateSrv) {
 
@@ -243,5 +240,3 @@ function (angular, _, $) {
     };
 
   });
-
-});