@@ -10,7 +10,6 @@ define([
'./confirmClick',
'./configModal',
'./spectrumPicker',
- './grafanaGraph',
'./bootstrap-tagsinput',
'./bodyClass',
'./addGraphiteFunc',
@@ -4,7 +4,15 @@ define([
'kbn',
'moment',
'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) {
'use strict';
@@ -7,19 +7,12 @@ define([
'components/timeSeries',
'components/panelmeta',
- './seriesOverridesCtrl',
- './legend',
'services/panelSrv',
'services/annotationsSrv',
'services/datasourceSrv',
- 'jquery.flot',
- 'jquery.flot.events',
- 'jquery.flot.selection',
- 'jquery.flot.time',
- 'jquery.flot.stack',
- 'jquery.flot.stackpercent',
- 'jquery.flot.fillbelow',
- 'jquery.flot.crosshair'
+ './seriesOverridesCtrl',
+ './graph',
+ './legend',
function (angular, app, $, _, kbn, moment, TimeSeries, PanelMeta) {
@@ -3,7 +3,7 @@ define([
'angular',
'jquery',
- 'directives/grafanaGraph'
+ 'panels/graph/graph'
], function(helpers, angular, $, TimeSeries) {
@@ -1,6 +1,6 @@
define([
- 'directives/grafanaGraph.tooltip'
+ 'panels/graph/graph.tooltip'
], function($, GraphTooltip) {
@@ -127,7 +127,7 @@ require([
'specs/influxQueryBuilder-specs',
'specs/influxdb-datasource-specs',
'specs/graph-ctrl-specs',
- 'specs/grafanaGraph-specs',
+ 'specs/graph-specs',
'specs/graph-tooltip-specs',
'specs/seriesOverridesCtrl-specs',
'specs/sharePanelCtrl-specs',