refactoring: more moving stuff around

public/app/components/require.config.js

@@ -3,7 +3,6 @@ require.config({
   baseUrl: 'public',
 
   paths: {
-    kbn:                      'app/components/kbn',
     'extend-jquery':          'app/components/extend-jquery',
     lodash:                   'app/components/lodash.extended',
 

public/app/core/directives/dash_upload.js

@@ -1,8 +1,8 @@
 define([
-  'kbn',
   '../core_module',
+  'app/core/utils/kbn',
 ],
-function (kbn, coreModule) {
+function (coreModule, kbn) {
   'use strict';
 
   coreModule.directive('dashUpload', function(timer, alertSrv, $location) {

public/app/core/directives/misc.js

@@ -1,9 +1,9 @@
 define([
   'angular',
-  'kbn',
   '../core_module',
+  'app/core/utils/kbn',
 ],
-function (angular, kbn, coreModule) {
+function (angular, coreModule, kbn) {
   'use strict';
 
   coreModule.directive('tip', function($compile) {

public/app/core/directives/ng_model_on_blur.js

@@ -1,9 +1,9 @@
 define([
-  'kbn',
-  'app/core/core_module',
+  '../core_module',
+  'app/core/utils/kbn',
   'app/core/utils/rangeutil',
 ],
-function (kbn, coreModule, rangeUtil) {
+function (coreModule, kbn, rangeUtil) {
   'use strict';
 
   coreModule.directive('ngModelOnblur', function() {

public/app/core/time_series.js

@@ -1,6 +1,6 @@
 define([
   'lodash',
-  'kbn'
+  'app/core/utils/kbn'
 ],
 function (_, kbn) {
   'use strict';

public/app/features/dashboard/dashboardLoaderSrv.js

@@ -3,7 +3,7 @@ define([
   'moment',
   'lodash',
   'jquery',
-  'kbn',
+  'app/core/utils/kbn',
   'app/core/utils/datemath',
 ],
 function (angular, moment, _, $, kbn, dateMath) {

public/app/features/dashboard/dashboardSrv.js

@@ -1,11 +1,10 @@
 define([
   'angular',
   'jquery',
-  'kbn',
   'lodash',
   'moment',
 ],
-function (angular, $, kbn, _, moment) {
+function (angular, $, _, moment) {
   'use strict';
 
   var module = angular.module('grafana.services');

public/app/features/dashboard/graphiteImportCtrl.js

@@ -1,7 +1,7 @@
 define([
   'angular',
   'lodash',
-  'kbn'
+  'app/core/utils/kbn'
 ],
 function (angular, _, kbn) {
   'use strict';

public/app/features/dashboard/playlistSrv.js

@@ -1,8 +1,7 @@
 define([
   'angular',
   'lodash',
-  'kbn',
-  'app/core/store'
+  'app/core/utils/kbn',
 ],
 function (angular, _, kbn) {
   'use strict';

public/app/features/dashboard/timeSrv.js

@@ -1,11 +1,11 @@
 define([
   'angular',
   'lodash',
-  'kbn',
   'moment',
   'app/core/config',
+  'app/core/utils/kbn',
   'app/core/utils/datemath'
-], function (angular, _, kbn, moment, config, dateMath) {
+], function (angular, _, moment, config, kbn, dateMath) {
   'use strict';
 
   var module = angular.module('grafana.services');

public/app/features/dashboard/timepicker/timepicker.ts

@@ -4,7 +4,7 @@
 import angular = require('angular');
 import _ = require('lodash');
 import moment = require('moment');
-import kbn = require('kbn');
+import kbn = require('app/core/utils/kbn');
 import dateMath = require('app/core/utils/datemath');
 import rangeUtil = require('app/core/utils/rangeutil');
 

public/app/features/panel/panel_helper.js

@@ -1,12 +1,12 @@
 define([
   'angular',
-  'app/core/utils/datemath',
-  'app/core/utils/rangeutil',
   'lodash',
-  'kbn',
   'jquery',
+  'app/core/utils/kbn',
+  'app/core/utils/datemath',
+  'app/core/utils/rangeutil',
 ],
-function (angular, dateMath, rangeUtil, _, kbn, $) {
+function (angular, _, $, kbn, dateMath, rangeUtil) {
   'use strict';
 
   var module = angular.module('grafana.services');

public/app/features/panellinks/linkSrv.js

@@ -1,9 +1,9 @@
 define([
   'angular',
-  'kbn',
   'lodash',
+  'app/core/utils/kbn',
 ],
-function (angular, kbn, _) {
+function (angular, _, kbn) {
   'use strict';
 
   angular

public/app/features/templating/templateValuesSrv.js

@@ -1,7 +1,7 @@
 define([
   'angular',
   'lodash',
-  'kbn',
+  'app/core/utils/kbn',
 ],
 function (angular, _, kbn) {
   'use strict';

public/app/headers/common.d.ts

@@ -9,7 +9,7 @@ declare module 'app/core/config' {
   export = config;
 }
 
-declare module 'kbn' {
+declare module 'app/core/utils/kbn' {
   var kbn : any;
   export = kbn;
 }

public/app/panels/graph/graph.js

@@ -1,9 +1,9 @@
 define([
   'angular',
   'jquery',
-  'kbn',
   'moment',
   'lodash',
+  'app/core/utils/kbn',
   './graph.tooltip',
   'jquery.flot',
   'jquery.flot.events',
@@ -14,7 +14,7 @@ define([
   'jquery.flot.fillbelow',
   'jquery.flot.crosshair'
 ],
-function (angular, $, kbn, moment, _, GraphTooltip) {
+function (angular, $, moment, _, kbn, GraphTooltip) {
   'use strict';
 
   var module = angular.module('grafana.directives');

public/app/panels/graph/legend.js

@@ -1,12 +1,11 @@
 define([
   'angular',
   'lodash',
-  'kbn',
   'jquery',
   'jquery.flot',
   'jquery.flot.time',
 ],
-function (angular, _, kbn, $) {
+function (angular, _, $) {
   'use strict';
 
   var module = angular.module('grafana.panels.graph');

public/app/panels/graph/module.js

@@ -1,16 +1,15 @@
 define([
   'angular',
-  'jquery',
   'lodash',
-  'kbn',
   'moment',
+  'app/core/utils/kbn',
   'app/core/time_series',
   'app/features/panel/panel_meta',
   './seriesOverridesCtrl',
   './graph',
   './legend',
 ],
-function (angular, $, _, kbn, moment, TimeSeries, PanelMeta) {
+function (angular, _, moment, kbn, TimeSeries, PanelMeta) {
   'use strict';
 
   var module = angular.module('grafana.panels.graph');
@@ -42,9 +41,9 @@ function (angular, $, _, kbn, moment, TimeSeries, PanelMeta) {
     var _d = {
       // datasource name, null = default datasource
       datasource: null,
-       // sets client side (flot) or native graphite png renderer (png)
+      // sets client side (flot) or native graphite png renderer (png)
       renderer: 'flot',
-       // Show/hide the x-axis
+      // Show/hide the x-axis
       'x-axis'      : true,
       // Show/hide y-axis
       'y-axis'      : true,
@@ -179,8 +178,8 @@ function (angular, $, _, kbn, moment, TimeSeries, PanelMeta) {
 
       var series = new TimeSeries({
         datapoints: datapoints,
-          alias: alias,
-          color: color,
+        alias: alias,
+        color: color,
       });
 
       if (datapoints && datapoints.length > 0) {

public/app/panels/singlestat/module.js

@@ -2,7 +2,7 @@ define([
   'angular',
   'app/app',
   'lodash',
-  'kbn',
+  'app/core/utils/kbn',
   'app/core/time_series',
   'app/features/panel/panel_meta',
   './singleStatPanel',

public/app/plugins/datasource/elasticsearch/datasource.js

@@ -2,7 +2,7 @@ define([
   'angular',
   'lodash',
   'moment',
-  'kbn',
+  'app/core/utils/kbn',
   './query_builder',
   './index_pattern',
   './elastic_response',

public/app/plugins/datasource/kairosdb/datasource.js

@@ -2,7 +2,7 @@ define([
   'angular',
   'lodash',
   'app/core/utils/datemath',
-  'kbn',
+  'app/core/utils/kbn',
   './queryCtrl',
   './directives',
 ],

public/app/plugins/datasource/opentsdb/queryCtrl.js

@@ -1,7 +1,7 @@
 define([
   'angular',
   'lodash',
-  'kbn'
+  'app/core/utils/kbn'
 ],
 function (angular, _, kbn) {
   'use strict';

public/app/plugins/datasource/sql/datasource.js

@@ -1,7 +1,5 @@
 define([
   'angular',
-  'lodash',
-  'kbn',
 ],
 function (angular) {
   'use strict';

public/test/specs/helpers.js

@@ -1,8 +1,7 @@
 define([
- 'kbn',
  'lodash',
  'app/core/utils/datemath',
-], function(kbn, _, dateMath) {
+], function(_, dateMath) {
   'use strict';
 
   function ControllerTestContext() {

public/test/specs/kbn-format-specs.js

@@ -1,5 +1,5 @@
 define([
-  'kbn',
+  'app/core/utils/kbn',
   'app/core/utils/datemath'
 ], function(kbn, dateMath) {
   'use strict';

public/test/test-main.js

@@ -2,9 +2,6 @@ require.config({
   baseUrl: 'http://localhost:9876/base/',
 
   paths: {
-    kbn:                   'app/components/kbn',
-
-    settings:              'app/components/settings',
     lodash:                'app/components/lodash.extended',
     'lodash-src':          'vendor/lodash',