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

This commit is contained in:
Torkel Ödegaard
2014-12-31 11:05:19 +01:00
parent 2f811375bb
commit 39f3cfc1eb
26 changed files with 22 additions and 22 deletions
-6
View File
@@ -1,15 +1,9 @@
define([ define([
'./grafanaCtrl', './grafanaCtrl',
'./dashboardCtrl',
'./dashboardNavCtrl',
'./row',
'./submenuCtrl',
'./pulldown', './pulldown',
'./search', './search',
'./metricKeys', './metricKeys',
'./graphiteImport', './graphiteImport',
'./playlistCtrl',
'./inspectCtrl', './inspectCtrl',
'./sharePanelCtrl',
'./jsonEditorCtrl', './jsonEditorCtrl',
], function () {}); ], function () {});
+1
View File
@@ -6,4 +6,5 @@ define([
'./influxdb/datasource', './influxdb/datasource',
'./opentsdb/datasource', './opentsdb/datasource',
'./elasticsearch/datasource', './elasticsearch/datasource',
'./dashboard/all',
], function () {}); ], function () {});
+14
View File
@@ -0,0 +1,14 @@
define([
'./dashboardCtrl',
'./dashboardNavCtrl',
'./playlistCtrl',
'./rowCtrl',
'./sharePanelCtrl',
'./submenuCtrl',
'./dashboardSrv',
'./keybindings',
'./viewStateSrv',
'./playlistSrv',
'./panelSrv',
'./timeSrv',
], function () {});
@@ -4,7 +4,6 @@ define([
'kbn', 'kbn',
'lodash', 'lodash',
'moment', 'moment',
'../timer',
], ],
function (angular, $, kbn, _, moment) { function (angular, $, kbn, _, moment) {
'use strict'; 'use strict';
-1
View File
@@ -7,7 +7,6 @@ define([
'moment', 'moment',
'components/timeSeries', 'components/timeSeries',
'components/panelmeta', 'components/panelmeta',
'services/panelSrv',
'./seriesOverridesCtrl', './seriesOverridesCtrl',
'./graph', './graph',
'./legend', './legend',
-1
View File
@@ -5,7 +5,6 @@ define([
'components/timeSeries', 'components/timeSeries',
'kbn', 'kbn',
'components/panelmeta', 'components/panelmeta',
'services/panelSrv',
'./singleStatPanel', './singleStatPanel',
], ],
function (angular, app, _, TimeSeries, kbn, PanelMeta) { function (angular, app, _, TimeSeries, kbn, PanelMeta) {
-7
View File
@@ -2,15 +2,8 @@ define([
'./alertSrv', './alertSrv',
'./utilSrv', './utilSrv',
'./datasourceSrv', './datasourceSrv',
'./timeSrv',
'./panelSrv',
'./timer', './timer',
'./keyboardManager', './keyboardManager',
'./popoverSrv', './popoverSrv',
'./playlistSrv',
'./unsavedChangesSrv',
'./dashboard/dashboardKeyBindings',
'./dashboard/dashboardSrv',
'./dashboard/dashboardViewStateSrv',
], ],
function () {}); function () {});
+1 -1
View File
@@ -1,5 +1,5 @@
define([ define([
'services/dashboard/dashboardSrv' 'features/dashboard/dashboardSrv'
], function() { ], function() {
'use strict'; 'use strict';
@@ -1,5 +1,5 @@
define([ define([
'services/dashboard/dashboardViewStateSrv' 'features/dashboard/viewStateSrv'
], function() { ], function() {
'use strict'; 'use strict';
+1
View File
@@ -1,5 +1,6 @@
define([ define([
'helpers', 'helpers',
'features/dashboard/panelSrv',
'panels/graph/module' 'panels/graph/module'
], function(helpers) { ], function(helpers) {
'use strict'; 'use strict';
+1 -1
View File
@@ -1,6 +1,6 @@
define([ define([
'helpers', 'helpers',
'controllers/row' 'features/dashboard/rowCtrl'
], function(helpers) { ], function(helpers) {
'use strict'; 'use strict';
+1 -1
View File
@@ -1,6 +1,6 @@
define([ define([
'helpers', 'helpers',
'controllers/sharePanelCtrl' 'features/dashboard/sharePanelCtrl'
], function(helpers) { ], function(helpers) {
'use strict'; 'use strict';
+2 -1
View File
@@ -2,7 +2,8 @@ define([
'mocks/dashboard-mock', 'mocks/dashboard-mock',
'helpers', 'helpers',
'lodash', 'lodash',
'services/timeSrv' 'services/timer',
'features/dashboard/timeSrv'
], function(dashboardMock, helpers, _) { ], function(dashboardMock, helpers, _) {
'use strict'; 'use strict';
-1
View File
@@ -109,7 +109,6 @@ require([
} }
} }
angular.module('grafana', ['ngRoute']); angular.module('grafana', ['ngRoute']);
angular.module('grafana.services', ['ngRoute', '$strap.directives']); angular.module('grafana.services', ['ngRoute', '$strap.directives']);
angular.module('grafana.panels', []); angular.module('grafana.panels', []);