moved dashboard stuff into a feature folder, not sure about this, but need better structure and better way to organize dependencies

pull/1019/merge
Torkel Ödegaard 11 years ago
parent 2f811375bb
commit 39f3cfc1eb
  1. 6
      src/app/controllers/all.js
  2. 1
      src/app/features/all.js
  3. 14
      src/app/features/dashboard/all.js
  4. 0
      src/app/features/dashboard/dashboardCtrl.js
  5. 0
      src/app/features/dashboard/dashboardNavCtrl.js
  6. 1
      src/app/features/dashboard/dashboardSrv.js
  7. 0
      src/app/features/dashboard/keybindings.js
  8. 0
      src/app/features/dashboard/panelSrv.js
  9. 0
      src/app/features/dashboard/playlistCtrl.js
  10. 0
      src/app/features/dashboard/playlistSrv.js
  11. 0
      src/app/features/dashboard/rowCtrl.js
  12. 0
      src/app/features/dashboard/sharePanelCtrl.js
  13. 0
      src/app/features/dashboard/submenuCtrl.js
  14. 0
      src/app/features/dashboard/timeSrv.js
  15. 0
      src/app/features/dashboard/unsavedChangesSrv.js
  16. 0
      src/app/features/dashboard/viewStateSrv.js
  17. 1
      src/app/panels/graph/module.js
  18. 1
      src/app/panels/singlestat/module.js
  19. 7
      src/app/services/all.js
  20. 2
      src/test/specs/dashboardSrv-specs.js
  21. 2
      src/test/specs/dashboardViewStateSrv-specs.js
  22. 1
      src/test/specs/graph-ctrl-specs.js
  23. 2
      src/test/specs/row-ctrl-specs.js
  24. 2
      src/test/specs/sharePanelCtrl-specs.js
  25. 3
      src/test/specs/timeSrv-specs.js
  26. 1
      src/test/test-main.js

@ -1,15 +1,9 @@
define([
'./grafanaCtrl',
'./dashboardCtrl',
'./dashboardNavCtrl',
'./row',
'./submenuCtrl',
'./pulldown',
'./search',
'./metricKeys',
'./graphiteImport',
'./playlistCtrl',
'./inspectCtrl',
'./sharePanelCtrl',
'./jsonEditorCtrl',
], function () {});

@ -6,4 +6,5 @@ define([
'./influxdb/datasource',
'./opentsdb/datasource',
'./elasticsearch/datasource',
'./dashboard/all',
], function () {});

@ -0,0 +1,14 @@
define([
'./dashboardCtrl',
'./dashboardNavCtrl',
'./playlistCtrl',
'./rowCtrl',
'./sharePanelCtrl',
'./submenuCtrl',
'./dashboardSrv',
'./keybindings',
'./viewStateSrv',
'./playlistSrv',
'./panelSrv',
'./timeSrv',
], function () {});

@ -4,7 +4,6 @@ define([
'kbn',
'lodash',
'moment',
'../timer',
],
function (angular, $, kbn, _, moment) {
'use strict';

@ -7,7 +7,6 @@ define([
'moment',
'components/timeSeries',
'components/panelmeta',
'services/panelSrv',
'./seriesOverridesCtrl',
'./graph',
'./legend',

@ -5,7 +5,6 @@ define([
'components/timeSeries',
'kbn',
'components/panelmeta',
'services/panelSrv',
'./singleStatPanel',
],
function (angular, app, _, TimeSeries, kbn, PanelMeta) {

@ -2,15 +2,8 @@ define([
'./alertSrv',
'./utilSrv',
'./datasourceSrv',
'./timeSrv',
'./panelSrv',
'./timer',
'./keyboardManager',
'./popoverSrv',
'./playlistSrv',
'./unsavedChangesSrv',
'./dashboard/dashboardKeyBindings',
'./dashboard/dashboardSrv',
'./dashboard/dashboardViewStateSrv',
],
function () {});

@ -1,5 +1,5 @@
define([
'services/dashboard/dashboardSrv'
'features/dashboard/dashboardSrv'
], function() {
'use strict';

@ -1,5 +1,5 @@
define([
'services/dashboard/dashboardViewStateSrv'
'features/dashboard/viewStateSrv'
], function() {
'use strict';

@ -1,5 +1,6 @@
define([
'helpers',
'features/dashboard/panelSrv',
'panels/graph/module'
], function(helpers) {
'use strict';

@ -1,6 +1,6 @@
define([
'helpers',
'controllers/row'
'features/dashboard/rowCtrl'
], function(helpers) {
'use strict';

@ -1,6 +1,6 @@
define([
'helpers',
'controllers/sharePanelCtrl'
'features/dashboard/sharePanelCtrl'
], function(helpers) {
'use strict';

@ -2,7 +2,8 @@ define([
'mocks/dashboard-mock',
'helpers',
'lodash',
'services/timeSrv'
'services/timer',
'features/dashboard/timeSrv'
], function(dashboardMock, helpers, _) {
'use strict';

@ -109,7 +109,6 @@ require([
}
}
angular.module('grafana', ['ngRoute']);
angular.module('grafana.services', ['ngRoute', '$strap.directives']);
angular.module('grafana.panels', []);

Loading…
Cancel
Save