Commit 20453802 by Torkel Ödegaard

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

parent 1c0fc3c9
......@@ -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([
'moment',
'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) {
'use strict';
......
......@@ -3,7 +3,7 @@ define([
'angular',
'jquery',
'components/timeSeries',
'directives/grafanaGraph'
'panels/graph/graph'
], function(helpers, angular, $, TimeSeries) {
'use strict';
......
define([
'jquery',
'directives/grafanaGraph.tooltip'
'panels/graph/graph.tooltip'
], function($, GraphTooltip) {
'use strict';
......
......@@ -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',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment