got graph panel to load

torkelo · torkelo · commit 8b63ca8fd467 · 2015-09-13T20:04:33.000+02:00
diff --git a/public/app/features/panel/panelDirective.js b/public/app/features/panel/panelDirective.js
@@ -14,12 +14,38 @@ function (angular, $, config) {
       link: function(scope, elem, attr) {
         var getter = $parse(attr.type), panelType = getter(scope);
         var panelPath = config.panels[panelType].path;
-
-        scope.require([panelPath + "/module"], function () {
+        var doneFn = function() {
           var panelEl = angular.element(document.createElement('grafana-panel-' + panelType));
           elem.append(panelEl);
-          $compile(panelEl)(scope);
-        });
+
+          scope.$apply(function() {
+            $compile(panelEl)(scope);
+          });
+        };
+
+        switch(panelType) {
+          case 'graph':  {
+            require.ensure([], function() {
+              require('../../panels/graph/module');
+              doneFn();
+            });
+            break;
+          }
+          case 'text':  {
+            require.ensure([], function() {
+              require('../../panels/text/module');
+              doneFn();
+            });
+            break;
+          }
+          case 'dashlist':  {
+            require.ensure([], function() {
+              require('../../panels/text/module');
+              doneFn();
+            });
+            break;
+          }
+        }
       }
     };
   });
diff --git a/public/app/panels/graph/legend.js b/public/app/panels/graph/legend.js
@@ -1,16 +1,15 @@
 define([
   'angular',
-  'app',
   'lodash',
   'kbn',
   'jquery',
   'jquery.flot',
   'jquery.flot.time',
 ],
-function (angular, app, _, kbn, $) {
+function (angular, _, kbn, $) {
   'use strict';
 
-  var module = angular.module('grafana.panels.graph');
+  var module = angular.module('grafana.directives');
 
   module.directive('graphLegend', function(popoverSrv) {
 
diff --git a/public/app/panels/graph/module.js b/public/app/panels/graph/module.js
@@ -1,20 +1,19 @@
 define([
   'angular',
-  'app',
   'jquery',
   'lodash',
   'kbn',
   'moment',
-  'components/timeSeries',
-  'components/panelmeta',
+  '../../components/timeSeries',
+  '../../components/panelmeta',
   './seriesOverridesCtrl',
   './graph',
   './legend',
 ],
-function (angular, app, $, _, kbn, moment, TimeSeries, PanelMeta) {
+function (angular, $, _, kbn, moment, TimeSeries, PanelMeta) {
   'use strict';
 
-  var module = angular.module('grafana.panels.graph');
+  var module = angular.module('grafana.controllers');
 
   module.directive('grafanaPanelGraph', function() {
     return {
diff --git a/public/app/panels/graph/seriesOverridesCtrl.js b/public/app/panels/graph/seriesOverridesCtrl.js
@@ -1,13 +1,12 @@
 define([
   'angular',
   'jquery',
-  'app',
   'lodash',
-], function(angular, jquery, app, _) {
+], function(angular, jquery, _) {
   'use strict';
 
-  var module = angular.module('grafana.panels.graph', []);
-  app.useModule(module);
+  var module = angular.module('grafana.controllers');
+  //app.useModule(module);
 
   module.controller('SeriesOverridesCtrl', function($scope, $element, popoverSrv) {
     $scope.overrideMenu = [];
diff --git a/webpack.config.js b/webpack.config.js
@@ -43,7 +43,7 @@ var webpackConfig = {
       /\.d\.ts/,
       /\.map/,
       /cloudwatch/,
-      /app\/panels/,
+      /app\/panels\/text/,
       /\.json/,
       /moment\.js/
     ],
@@ -81,6 +81,14 @@ var webpackConfig = {
       "spectrum": absDir('/vendor/spectrum.js'),
       "lodash-src": absDir('/vendor/lodash.js'),
       "bindonce": absDir('/vendor/angular-bindonce/bindonce.js'),
+      "jquery.flot": absDir('/vendor/flot/jquery.flot.js'),
+      "jquery.flot.crosshair": absDir('/vendor/flot/jquery.flot.crosshair.js'),
+      "jquery.flot.events": absDir('/vendor/flot/jquery.flot.events.js'),
+      "jquery.flot.fillbelow": absDir('/vendor/flot/jquery.flot.fillbelow.js'),
+      "jquery.flot.selection": absDir('/vendor/flot/jquery.flot.selection.js'),
+      "jquery.flot.stack": absDir('/vendor/flot/jquery.flot.stack.js'),
+      "jquery.flot.stackpercent": absDir('/vendor/flot/jquery.flot.stackpercent.js'),
+      "jquery.flot.time": absDir('/vendor/flot/jquery.flot.time.js'),
     },
     root: [
       __dirname + '/public_gen',
