Graph: moved graph and graph tooltip directive into panels/graph folder

This commit is contained in:
Torkel Ödegaard
2014-11-12 11:58:04 +01:00
parent 1c0fc3c924
commit 2045380223
7 changed files with 15 additions and 15 deletions

View File

@@ -10,7 +10,6 @@ define([
'./confirmClick', './confirmClick',
'./configModal', './configModal',
'./spectrumPicker', './spectrumPicker',
'./grafanaGraph',
'./bootstrap-tagsinput', './bootstrap-tagsinput',
'./bodyClass', './bodyClass',
'./addGraphiteFunc', './addGraphiteFunc',

View File

@@ -4,7 +4,15 @@ define([
'kbn', 'kbn',
'moment', 'moment',
'lodash', 'lodash',
'./grafanaGraph.tooltip' './graph.tooltip',
'jquery.flot',
'jquery.flot.events',
'jquery.flot.selection',
'jquery.flot.time',
'jquery.flot.stack',
'jquery.flot.stackpercent',
'jquery.flot.fillbelow',
'jquery.flot.crosshair'
], ],
function (angular, $, kbn, moment, _, GraphTooltip) { function (angular, $, kbn, moment, _, GraphTooltip) {
'use strict'; 'use strict';

View File

@@ -7,19 +7,12 @@ define([
'moment', 'moment',
'components/timeSeries', 'components/timeSeries',
'components/panelmeta', 'components/panelmeta',
'./seriesOverridesCtrl',
'./legend',
'services/panelSrv', 'services/panelSrv',
'services/annotationsSrv', 'services/annotationsSrv',
'services/datasourceSrv', 'services/datasourceSrv',
'jquery.flot', './seriesOverridesCtrl',
'jquery.flot.events', './graph',
'jquery.flot.selection', './legend',
'jquery.flot.time',
'jquery.flot.stack',
'jquery.flot.stackpercent',
'jquery.flot.fillbelow',
'jquery.flot.crosshair'
], ],
function (angular, app, $, _, kbn, moment, TimeSeries, PanelMeta) { function (angular, app, $, _, kbn, moment, TimeSeries, PanelMeta) {
'use strict'; 'use strict';

View File

@@ -3,7 +3,7 @@ define([
'angular', 'angular',
'jquery', 'jquery',
'components/timeSeries', 'components/timeSeries',
'directives/grafanaGraph' 'panels/graph/graph'
], function(helpers, angular, $, TimeSeries) { ], function(helpers, angular, $, TimeSeries) {
'use strict'; 'use strict';

View File

@@ -1,6 +1,6 @@
define([ define([
'jquery', 'jquery',
'directives/grafanaGraph.tooltip' 'panels/graph/graph.tooltip'
], function($, GraphTooltip) { ], function($, GraphTooltip) {
'use strict'; 'use strict';

View File

@@ -127,7 +127,7 @@ require([
'specs/influxQueryBuilder-specs', 'specs/influxQueryBuilder-specs',
'specs/influxdb-datasource-specs', 'specs/influxdb-datasource-specs',
'specs/graph-ctrl-specs', 'specs/graph-ctrl-specs',
'specs/grafanaGraph-specs', 'specs/graph-specs',
'specs/graph-tooltip-specs', 'specs/graph-tooltip-specs',
'specs/seriesOverridesCtrl-specs', 'specs/seriesOverridesCtrl-specs',
'specs/sharePanelCtrl-specs', 'specs/sharePanelCtrl-specs',