refactor: improving structure, moving things into a core module

public/app/app.js

@@ -73,7 +73,6 @@ function (angular, $, _, appLevelRequire) {
     'services/all',
     'services/all',
     'features/all',
     'features/all',
     'controllers/all',
     'controllers/all',
-    'directives/all',
     'components/partials',
     'components/partials',
     'routes/all',
     'routes/all',
   ];
   ];

public/app/core/core.ts

+///<amd-dependency path="./directives/annotation_tooltip" />
+///<amd-dependency path="./directives/body_class" />
+///<amd-dependency path="./directives/config_modal" />
+///<amd-dependency path="./directives/confirm_click" />
+///<amd-dependency path="./directives/dash_edit_link" />
+///<amd-dependency path="./directives/dash_upload" />
+///<amd-dependency path="./directives/dropdown_typeahead" />
+///<amd-dependency path="./directives/grafana_version_check" />
+///<amd-dependency path="./directives/metric_segment" />
+///<amd-dependency path="./directives/misc" />
+///<amd-dependency path="./directives/ng_model_on_blur" />
+///<amd-dependency path="./directives/password_strenght" />
+///<amd-dependency path="./directives/spectrum_picker" />
+///<amd-dependency path="./directives/tags" />
+///<amd-dependency path="./directives/topnav" />
+///<amd-dependency path="./directives/value_select_dropdown" />
 
 
 export * from './directives/array_join'
 export * from './directives/array_join'
-export * from './directives/giveFocus'
+export * from './directives/give_focus'
 
 
 export * from './routes/module_loader'
 export * from './routes/module_loader'
 export * from './filters/filters'
 export * from './filters/filters'

public/app/core/core_module.ts

@@ -2,4 +2,4 @@
 
 
 import angular = require('angular');
 import angular = require('angular');
 
 
-export default angular.module('grafana.core', []);
+export = angular.module('grafana.core', []);

public/app/directives/annotationTooltip.js → public/app/core/directives/annotation_tooltip.js

 define([
 define([
-  'angular',
   'jquery',
   'jquery',
-  'lodash'
+  'lodash',
+  '../core_module',
 ],
 ],
-function (angular, $, _) {
+function ($, _, coreModule) {
   'use strict';
   'use strict';
 
 
-  angular
-  .module('grafana.directives')
-  .directive('annotationTooltip', function($sanitize, dashboardSrv, $compile) {
+  coreModule.directive('annotationTooltip', function($sanitize, dashboardSrv, $compile) {
 
 
     function sanitizeString(str) {
     function sanitizeString(str) {
       try {
       try {

public/app/core/directives/array_join.ts

@@ -2,7 +2,7 @@
 
 
 import angular = require('angular');
 import angular = require('angular');
 import _ = require('lodash');
 import _ = require('lodash');
-import coreModule from '../core_module';
+import coreModule = require('../core_module');
 
 
 export function arrayJoin() {
 export function arrayJoin() {
   'use strict';
   'use strict';

public/app/directives/bodyClass.js → public/app/core/directives/body_class.js

 define([
 define([
-  'angular',
   'lodash',
   'lodash',
-  'jquery'
+  'jquery',
+  '../core_module',
 ],
 ],
-function (angular, _, $) {
+function (_, $, coreModule) {
   'use strict';
   'use strict';
 
 
-  angular
-    .module('grafana.directives')
-    .directive('bodyClass', function() {
+  coreModule.directive('bodyClass', function() {
     return {
     return {
       link: function($scope, elem) {
       link: function($scope, elem) {
 
 

public/app/directives/configModal.js → public/app/core/directives/config_modal.js

 define([
 define([
-  'angular',
   'lodash',
   'lodash',
-  'jquery'
+  'jquery',
+  '../core_module',
 ],
 ],
-function (angular, _, $) {
+function (_, $, coreModule) {
   'use strict';
   'use strict';
 
 
-  angular
-    .module('grafana.directives')
-    .directive('configModal', function($modal, $q, $timeout) {
+  coreModule.directive('configModal', function($modal, $q, $timeout) {
     return {
     return {
       restrict: 'A',
       restrict: 'A',
       link: function(scope, elem, attrs) {
       link: function(scope, elem, attrs) {

public/app/directives/confirmClick.js → public/app/core/directives/confirm_click.js

 define([
 define([
-  'angular',
-  'kbn'
+  '../core_module',
 ],
 ],
-function (angular) {
+function (coreModule) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('grafana.directives');
-
-  module.directive('confirmClick', function() {
+  coreModule.directive('confirmClick', function() {
     return {
     return {
       restrict: 'A',
       restrict: 'A',
       link: function(scope, elem, attrs) {
       link: function(scope, elem, attrs) {

public/app/directives/dashEditLink.js → public/app/core/directives/dash_edit_link.js

 define([
 define([
-  'angular',
-  'jquery'
+  'jquery',
+  '../core_module',
 ],
 ],
-function (angular, $) {
+function ($, coreModule) {
   'use strict';
   'use strict';
 
 
   var editViewMap = {
   var editViewMap = {
@@ -11,9 +11,7 @@ function (angular, $) {
     'templating':  { src: 'app/features/templating/partials/editor.html', title: "Templating" }
     'templating':  { src: 'app/features/templating/partials/editor.html', title: "Templating" }
   };
   };
 
 
-  angular
-    .module('grafana.directives')
-    .directive('dashEditorLink', function($timeout) {
+  coreModule.directive('dashEditorLink', function($timeout) {
     return {
     return {
       restrict: 'A',
       restrict: 'A',
       link: function(scope, elem, attrs) {
       link: function(scope, elem, attrs) {
@@ -29,9 +27,7 @@ function (angular, $) {
     };
     };
   });
   });
 
 
-  angular
-    .module('grafana.directives')
-    .directive('dashEditorView', function($compile, $location) {
+  coreModule.directive('dashEditorView', function($compile, $location) {
     return {
     return {
       restrict: 'A',
       restrict: 'A',
       link: function(scope, elem) {
       link: function(scope, elem) {

public/app/directives/dashUpload.js → public/app/core/directives/dash_upload.js

 define([
 define([
-  'angular',
-  'kbn'
+  'kbn',
+  '../core_module',
 ],
 ],
-function (angular, kbn) {
+function (kbn, coreModule) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('grafana.directives');
-
-  module.directive('dashUpload', function(timer, alertSrv, $location) {
+  coreModule.directive('dashUpload', function(timer, alertSrv, $location) {
     return {
     return {
       restrict: 'A',
       restrict: 'A',
       link: function(scope) {
       link: function(scope) {

public/app/directives/dropdown.typeahead.js → public/app/core/directives/dropdown_typeahead.js

 define([
 define([
-  'angular',
   'lodash',
   'lodash',
   'jquery',
   'jquery',
+  '../core_module',
 ],
 ],
-function (angular, _, $) {
+function (_, $, coreModule) {
   'use strict';
   'use strict';
 
 
-  angular
-    .module('grafana.directives')
-    .directive('dropdownTypeahead', function($compile) {
+  coreModule.directive('dropdownTypeahead', function($compile) {
 
 
     var inputTemplate = '<input type="text"'+
     var inputTemplate = '<input type="text"'+
       ' class="tight-form-input input-medium tight-form-input"' +
       ' class="tight-form-input input-medium tight-form-input"' +

public/app/core/directives/giveFocus.ts → public/app/core/directives/give_focus.ts

 ///<reference path="../../headers/common.d.ts" />
 ///<reference path="../../headers/common.d.ts" />
 
 
 import angular = require('angular');
 import angular = require('angular');
-import coreModule from '../core_module';
+import coreModule = require('../core_module');
 
 
 coreModule.directive('giveFocus', function() {
 coreModule.directive('giveFocus', function() {
   return function(scope, element, attrs) {
   return function(scope, element, attrs) {

public/app/directives/grafanaVersionCheck.js → public/app/core/directives/grafana_version_check.js

 define([
 define([
-  'angular'
+  '../core_module',
 ],
 ],
-function (angular) {
+function (coreModule) {
   'use strict';
   'use strict';
 
 
-  angular
-    .module('grafana.directives')
-    .directive('grafanaVersionCheck', function($http, contextSrv) {
+  coreModule.directive('grafanaVersionCheck', function($http, contextSrv) {
     return {
     return {
       restrict: 'A',
       restrict: 'A',
       link: function(scope, elem) {
       link: function(scope, elem) {

public/app/directives/metric.segment.js → public/app/core/directives/metric_segment.js

 define([
 define([
-  'angular',
   'lodash',
   'lodash',
   'jquery',
   'jquery',
+  '../core_module',
 ],
 ],
-function (angular, _, $) {
+function (_, $, coreModule) {
   'use strict';
   'use strict';
 
 
-  angular
-    .module('grafana.directives')
-    .directive('metricSegment', function($compile, $sce) {
+  coreModule.directive('metricSegment', function($compile, $sce) {
     var inputTemplate = '<input type="text" data-provide="typeahead" ' +
     var inputTemplate = '<input type="text" data-provide="typeahead" ' +
       ' class="tight-form-clear-input input-medium"' +
       ' class="tight-form-clear-input input-medium"' +
       ' spellcheck="false" style="display:none"></input>';
       ' spellcheck="false" style="display:none"></input>';
@@ -155,9 +153,7 @@ function (angular, _, $) {
     };
     };
   });
   });
 
 
-  angular
-    .module('grafana.directives')
-    .directive('metricSegmentModel', function(uiSegmentSrv, $q) {
+  coreModule.directive('metricSegmentModel', function(uiSegmentSrv, $q) {
     return {
     return {
       template: '<metric-segment segment="segment" get-options="getOptionsInternal()" on-change="onSegmentChange()"></metric-segment>',
       template: '<metric-segment segment="segment" get-options="getOptionsInternal()" on-change="onSegmentChange()"></metric-segment>',
       restrict: 'E',
       restrict: 'E',

public/app/directives/misc.js → public/app/core/directives/misc.js

 define([
 define([
   'angular',
   'angular',
-  'kbn'
+  'kbn',
+  '../core_module',
 ],
 ],
-function (angular, kbn) {
+function (angular, kbn, coreModule) {
   'use strict';
   'use strict';
 
 
-  angular
-    .module('grafana.directives')
-    .directive('tip', function($compile) {
+  coreModule.directive('tip', function($compile) {
     return {
     return {
       restrict: 'E',
       restrict: 'E',
       link: function(scope, elem, attrs) {
       link: function(scope, elem, attrs) {
@@ -19,9 +18,7 @@ function (angular, kbn) {
     };
     };
   });
   });
 
 
-  angular
-    .module('grafana.directives')
-    .directive('watchChange', function() {
+  coreModule.directive('watchChange', function() {
     return {
     return {
       scope: { onchange: '&watchChange' },
       scope: { onchange: '&watchChange' },
       link: function(scope, element) {
       link: function(scope, element) {
@@ -34,9 +31,7 @@ function (angular, kbn) {
     };
     };
   });
   });
 
 
-  angular
-    .module('grafana.directives')
-    .directive('editorOptBool', function($compile) {
+  coreModule.directive('editorOptBool', function($compile) {
     return {
     return {
       restrict: 'E',
       restrict: 'E',
       link: function(scope, elem, attrs) {
       link: function(scope, elem, attrs) {
@@ -56,9 +51,7 @@ function (angular, kbn) {
     };
     };
   });
   });
 
 
-  angular
-    .module('grafana.directives')
-    .directive('editorCheckbox', function($compile, $interpolate) {
+  coreModule.directive('editorCheckbox', function($compile, $interpolate) {
     return {
     return {
       restrict: 'E',
       restrict: 'E',
       link: function(scope, elem, attrs) {
       link: function(scope, elem, attrs) {
@@ -80,10 +73,7 @@ function (angular, kbn) {
     };
     };
   });
   });
 
 
-  angular
-    .module('grafana.directives')
-    .directive('gfDropdown', function ($parse, $compile, $timeout) {
-
+  coreModule.directive('gfDropdown', function ($parse, $compile, $timeout) {
     function buildTemplate(items, placement) {
     function buildTemplate(items, placement) {
       var upclass = placement === 'top' ? 'dropup' : '';
       var upclass = placement === 'top' ? 'dropup' : '';
       var ul = [
       var ul = [

public/app/directives/ngModelOnBlur.js → public/app/core/directives/ng_model_on_blur.js

 define([
 define([
-  'angular',
-  'kbn'
+  'kbn',
+  '../core_module',
 ],
 ],
-function (angular, kbn) {
+function (kbn, coreModule) {
   'use strict';
   'use strict';
 
 
-  angular
-    .module('grafana.directives')
-    .directive('ngModelOnblur', function() {
+  coreModule.directive('ngModelOnblur', function() {
     return {
     return {
       restrict: 'A',
       restrict: 'A',
       priority: 1,
       priority: 1,
@@ -25,8 +23,9 @@ function (angular, kbn) {
         });
         });
       }
       }
     };
     };
-    })
-    .directive('emptyToNull', function () {
+  });
+
+  coreModule.directive('emptyToNull', function () {
     return {
     return {
       restrict: 'A',
       restrict: 'A',
       require: 'ngModel',
       require: 'ngModel',
@@ -37,8 +36,9 @@ function (angular, kbn) {
         });
         });
       }
       }
     };
     };
-    })
-    .directive('validTimeSpan', function() {
+  });
+
+  coreModule.directive('validTimeSpan', function() {
     return {
     return {
       require: 'ngModel',
       require: 'ngModel',
       link: function(scope, elm, attrs, ctrl) {
       link: function(scope, elm, attrs, ctrl) {

public/app/directives/passwordStrenght.js → public/app/core/directives/password_strenght.js

 define([
 define([
-  'angular',
+  '../core_module',
 ],
 ],
-function (angular) {
+function (coreModule) {
   'use strict';
   'use strict';
 
 
-  angular
-    .module('grafana.directives')
-    .directive('passwordStrength', function() {
+  coreModule.directive('passwordStrength', function() {
     var template = '<div class="password-strength small" ng-if="!loginMode" ng-class="strengthClass">' +
     var template = '<div class="password-strength small" ng-if="!loginMode" ng-class="strengthClass">' +
       '<em>{{strengthText}}</em>' +
       '<em>{{strengthText}}</em>' +
       '</div>';
       '</div>';

public/app/directives/spectrumPicker.js → public/app/core/directives/spectrum_picker.js

 define([
 define([
   'angular',
   'angular',
-  'spectrum'
+  '../core_module',
+  'spectrum',
 ],
 ],
-function (angular) {
+function (angular, coreModule) {
   'use strict';
   'use strict';
 
 
-  angular
-    .module('grafana.directives')
-    .directive('spectrumPicker', function() {
+  coreModule.directive('spectrumPicker', function() {
     return {
     return {
       restrict: 'E',
       restrict: 'E',
       require: 'ngModel',
       require: 'ngModel',

public/app/directives/tags.js → public/app/core/directives/tags.js

 define([
 define([
   'angular',
   'angular',
   'jquery',
   'jquery',
-  'bootstrap-tagsinput'
+  '../core_module',
+  'bootstrap-tagsinput',
 ],
 ],
-function (angular, $) {
+function (angular, $, coreModule) {
   'use strict';
   'use strict';
 
 
   function djb2(str) {
   function djb2(str) {
@@ -38,9 +39,7 @@ function (angular, $) {
     element.css("border-color", borderColor);
     element.css("border-color", borderColor);
   }
   }
 
 
-  angular
-  .module('grafana.directives')
-  .directive('tagColorFromName', function() {
+  coreModule.directive('tagColorFromName', function() {
     return {
     return {
       scope: { tagColorFromName: "=" },
       scope: { tagColorFromName: "=" },
       link: function (scope, element) {
       link: function (scope, element) {
@@ -49,9 +48,7 @@ function (angular, $) {
     };
     };
   });
   });
 
 
-  angular
-  .module('grafana.directives')
-  .directive('bootstrapTagsinput', function() {
+  coreModule.directive('bootstrapTagsinput', function() {
 
 
     function getItemProperty(scope, property) {
     function getItemProperty(scope, property) {
       if (!property) {
       if (!property) {

public/app/directives/topnav.js → public/app/core/directives/topnav.js

 define([
 define([
-  'angular',
-  'kbn'
+  '../core_module',
 ],
 ],
-function (angular) {
+function (coreModule) {
   'use strict';
   'use strict';
 
 
-  angular
-    .module('grafana.directives')
-    .directive('topnav', function($rootScope, contextSrv) {
+  coreModule.directive('topnav', function($rootScope, contextSrv) {
     return {
     return {
       restrict: 'E',
       restrict: 'E',
       transclude: true,
       transclude: true,

public/app/directives/valueSelectDropdown.js → public/app/core/directives/value_select_dropdown.js

 define([
 define([
   'angular',
   'angular',
   'lodash',
   'lodash',
-  'jquery',
+  '../core_module',
 ],
 ],
-function (angular, _) {
+function (angular, _, coreModule) {
   'use strict';
   'use strict';
 
 
-  angular
-    .module('grafana.controllers')
-    .controller('ValueSelectDropdownCtrl', function($q) {
+  coreModule.controller('ValueSelectDropdownCtrl', function($q) {
     var vm = this;
     var vm = this;
 
 
     vm.show = function() {
     vm.show = function() {
@@ -226,10 +224,7 @@ function (angular, _) {
 
 
   });
   });
 
 
-  angular
-    .module('grafana.directives')
-    .directive('valueSelectDropdown', function($compile, $window, $timeout, $rootScope) {
-
+  coreModule.directive('valueSelectDropdown', function($compile, $window, $timeout, $rootScope) {
     return {
     return {
       scope: { variable: "=", onUpdated: "&", getValuesForTag: "&" },
       scope: { variable: "=", onUpdated: "&", getValuesForTag: "&" },
       templateUrl: 'app/partials/valueSelectDropdown.html',
       templateUrl: 'app/partials/valueSelectDropdown.html',

public/app/core/filters/filters.ts

@@ -4,7 +4,7 @@ import angular = require('angular');
 import jquery = require('jquery');
 import jquery = require('jquery');
 import moment = require('moment');
 import moment = require('moment');
 import _ = require('lodash');
 import _ = require('lodash');
-import coreModule from '../core_module';
+import coreModule = require('../core_module');
 
 
 coreModule.filter('stringSort', function() {
 coreModule.filter('stringSort', function() {
   return function(input) {
   return function(input) {

public/app/directives/all.js

-define([
-  './dashUpload',
-  './dashEditLink',
-  './ngModelOnBlur',
-  './misc',
-  './confirmClick',
-  './configModal',
-  './spectrumPicker',
-  './tags',
-  './bodyClass',
-  './valueSelectDropdown',
-  './metric.segment',
-  './grafanaVersionCheck',
-  './dropdown.typeahead',
-  './topnav',
-  './annotationTooltip',
-  './passwordStrenght',
-], function () {});

public/app/partials/login.html

@@ -17,7 +17,7 @@
 			</div>
 			</div>
 
 
       <form name="loginForm" class="login-form" style="margin-top: 25px;">
       <form name="loginForm" class="login-form" style="margin-top: 25px;">
-				<div class="tight-from-container">
+				<div class="tight-form-container">
 					<div class="tight-form" ng-if="loginMode">
 					<div class="tight-form" ng-if="loginMode">
 						<ul class="tight-form-list">
 						<ul class="tight-form-list">
 							<li class="tight-form-item" style="width: 78px">
 							<li class="tight-form-item" style="width: 78px">
@@ -41,7 +41,7 @@
 						<div class="clearfix"></div>
 						<div class="clearfix"></div>
 					</div>
 					</div>
 
 
-					<div class="tight-form" ng-if="!loginMode" style="margin: 20px 0 57px 0">
+					<div class="tight-form" ng-if="!loginMode">
 						<ul class="tight-form-list">
 						<ul class="tight-form-list">
 							<li class="tight-form-item" style="width: 79px">
 							<li class="tight-form-item" style="width: 79px">
 								<strong>Email</strong>
 								<strong>Email</strong>

public/app/partials/signup_step2.html

@@ -36,7 +36,7 @@
 					</div>
 					</div>
 				</div>
 				</div>
 
 
-				<div class="tight-from-container">
+				<div class="tight-form-container">
 					<div class="tight-form" ng-if="!autoAssignOrg">
 					<div class="tight-form" ng-if="!autoAssignOrg">
 						<ul class="tight-form-list">
 						<ul class="tight-form-list">
 							<li class="tight-form-item" style="width: 128px">
 							<li class="tight-form-item" style="width: 128px">

public/test/specs/valueSelectDropdown-specs.js → public/test/specs/value_select_dropdown_specs.js

 define([
 define([
-  'directives/valueSelectDropdown',
+  'core/directives/value_select_dropdown',
 ],
 ],
 function () {
 function () {
   'use strict';
   'use strict';
 
 
-
   describe("SelectDropdownCtrl", function() {
   describe("SelectDropdownCtrl", function() {
     var scope;
     var scope;
     var ctrl;
     var ctrl;
     var tagValuesMap = {};
     var tagValuesMap = {};
     var rootScope;
     var rootScope;
 
 
-    beforeEach(module('grafana.controllers'));
+    beforeEach(module('grafana.core'));
     beforeEach(inject(function($controller, $rootScope, $q) {
     beforeEach(inject(function($controller, $rootScope, $q) {
       rootScope = $rootScope;
       rootScope = $rootScope;
       scope = $rootScope.$new();
       scope = $rootScope.$new();

public/test/test-main.js

@@ -149,7 +149,7 @@ require([
     'specs/singlestat-specs',
     'specs/singlestat-specs',
     'specs/dynamicDashboardSrv-specs',
     'specs/dynamicDashboardSrv-specs',
     'specs/unsavedChangesSrv-specs',
     'specs/unsavedChangesSrv-specs',
-    'specs/valueSelectDropdown-specs',
+    'specs/value_select_dropdown_specs',
     'specs/opentsdbDatasource-specs',
     'specs/opentsdbDatasource-specs',
     'specs/cloudwatch-datasource-specs',
     'specs/cloudwatch-datasource-specs',
     'specs/elasticsearch-specs',
     'specs/elasticsearch-specs',